aboutsummaryrefslogtreecommitdiffstats
path: root/tests/reproducers/custom
diff options
context:
space:
mode:
authorJiri Vanek <[email protected]>2012-10-19 16:18:25 +0200
committerJiri Vanek <[email protected]>2012-10-19 16:18:25 +0200
commit554b9047555dadff178e5e29c071b4b5d201c1bb (patch)
tree4c8878b38ddfc8732d6d62f80d4aa1ee737ac7ee /tests/reproducers/custom
parent6f0314690f4ace6b45fe49d6f9a32b985819123e (diff)
Renamed reproducers-related variables and targets
Diffstat (limited to 'tests/reproducers/custom')
-rw-r--r--tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile10
-rw-r--r--tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile8
-rw-r--r--tests/reproducers/custom/AppletFolderInArchiveTag/srcs/Makefile4
-rw-r--r--tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile6
4 files changed, 14 insertions, 14 deletions
diff --git a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile
index c08dc8a..1a575bd 100644
--- a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile
+++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile
@@ -1,7 +1,7 @@
TESTNAME=AdditionalJarsInMetaInfIndexList
ARCHIVE_TEST_FOLDER=archive_tag_folder_test
-JAVAC_CLASSPATH=$(JNLP_TESTS_ENGINE_DIR):$(NETX_DIR)/lib/classes.jar
+JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
KEYTOOL=$(BOOT_DIR)/bin/keytool
JARSIGNER=$(BOOT_DIR)/bin/jarsigner
JAVAC=$(BOOT_DIR)/bin/javac
@@ -49,10 +49,10 @@ prepare-reproducer:
# Move jars into deployment directory
cd $(TMPDIR); \
- mv $(INDEX_JAR_UNSIGNED) $(JNLP_TESTS_SERVER_DEPLOYDIR) ; \
- mv $(INDEX_JAR_SIGNED) $(JNLP_TESTS_SERVER_DEPLOYDIR) ; \
- mv $(MAINCLASS_JAR_UNSIGNED) $(JNLP_TESTS_SERVER_DEPLOYDIR) ; \
- mv $(MAINCLASS_JAR_SIGNED) $(JNLP_TESTS_SERVER_DEPLOYDIR) ;
+ mv $(INDEX_JAR_UNSIGNED) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) ; \
+ mv $(INDEX_JAR_SIGNED) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) ; \
+ mv $(MAINCLASS_JAR_UNSIGNED) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) ; \
+ mv $(MAINCLASS_JAR_SIGNED) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) ;
echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR)
rm -rf $(TMPDIR)
diff --git a/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile b/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile
index 980f24e..7e1e24c 100644
--- a/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile
+++ b/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile
@@ -4,7 +4,7 @@ SRC_FILES=AppletReferenceInSameJar.java AppletReferenceOutOfJar.java Referenced.
JAR_FILES=AppletReferenceInSameJar.class Referenced.class
OUTER_FILE=AppletReferenceOutOfJar.class
-JAVAC_CLASSPATH=$(JNLP_TESTS_ENGINE_DIR):$(NETX_DIR)/lib/classes.jar
+JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
JAVAC=$(BOOT_DIR)/bin/javac
JAR=$(BOOT_DIR)/bin/jar
@@ -17,11 +17,11 @@ prepare-reproducer:
cd $(TMPDIR); \
$(JAR) cvf $(TESTNAME).jar $(JAR_FILES); \
- mv $(OUTER_FILE) $(JNLP_TESTS_SERVER_DEPLOYDIR); \
- mv $(TESTNAME).jar $(JNLP_TESTS_SERVER_DEPLOYDIR);
+ mv $(OUTER_FILE) $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
+ mv $(TESTNAME).jar $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR);
echo PREPARED REPRODUCER $(TESTNAME), removing $(TMPDIR)
rm -rf $(TMPDIR)
clean-reproducer:
- echo NOTHING TO CLEAN FOR $(TESTNAME) \ No newline at end of file
+ echo NOTHING TO CLEAN FOR $(TESTNAME)
diff --git a/tests/reproducers/custom/AppletFolderInArchiveTag/srcs/Makefile b/tests/reproducers/custom/AppletFolderInArchiveTag/srcs/Makefile
index ded932c..f993321 100644
--- a/tests/reproducers/custom/AppletFolderInArchiveTag/srcs/Makefile
+++ b/tests/reproducers/custom/AppletFolderInArchiveTag/srcs/Makefile
@@ -1,7 +1,7 @@
TESTNAME=AppletFolderInArchiveTag
ARCHIVE_TEST_FOLDER=archive_tag_folder_test
-JAVAC_CLASSPATH=$(JNLP_TESTS_ENGINE_DIR):$(NETX_DIR)/lib/classes.jar
-DEPLOY_SUBDIR=$(JNLP_TESTS_SERVER_DEPLOYDIR)/$(ARCHIVE_TEST_FOLDER)
+JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
+DEPLOY_SUBDIR=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$(ARCHIVE_TEST_FOLDER)
INDEX_HTML_BODY="<html><body><h1>Required to recognize folder structure</h1></body></html>"
prepare-reproducer:
diff --git a/tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile b/tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile
index 15c243c..fdcca3b 100644
--- a/tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile
+++ b/tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile
@@ -1,9 +1,9 @@
TESTNAME=UnsignedContentInMETAINF
-JAVAC_CLASSPATH=$(JNLP_TESTS_ENGINE_DIR):$(NETX_DIR)/lib/classes.jar
-DEPLOY_DIR=$(JNLP_TESTS_SERVER_DEPLOYDIR)
+JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
+DEPLOY_DIR=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
JAVAC=$(BOOT_DIR)/bin/javac
JAR=$(BOOT_DIR)/bin/jar
-ABS_SRC_PATH=$(JNLP_TESTS_SRCDIR)/custom/$(TESTNAME)/srcs
+ABS_SRC_PATH=$(REPRODUCERS_TESTS_SRCDIR)/custom/$(TESTNAME)/srcs
prepare-reproducer:
echo PREPARING REPRODUCER $(TESTNAME)