From 49caf7ecccb6d329991bf25a6667f7f38396b3f5 Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 9 Sep 2020 16:18:11 +0200 Subject: [PATCH] replace the rest of javac invocations with $(JAVAC_CMD) --- .../test/utils/transport/fsmqmanager/test/identities/Makefile | 2 +- .../utils/transport/fsmqmanager/test/stateless_ping/Makefile | 2 +- .../utils/transport/fsmqmanager/test/stateless_rxtx/Makefile | 2 +- .../test/utils/transport/fsmsgqueue/test/regression/Makefile | 2 +- test/java/foundation/pEp/pitytest/Makefile.conf | 2 ++ test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile | 2 +- test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile | 2 +- test/java/foundation/pEp/pitytest/examples/helloworld/Makefile | 2 +- test/java/foundation/pEp/pitytest/examples/testsuite/Makefile | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile index 0d73d43..408c8b9 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile +++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile @@ -22,7 +22,7 @@ run: compile compile: $(JAVA_CLASSES) pitytest %.class: %.java - cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< + cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< clean: rm -f $(JAVA_CLASSES) diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile index 7f67743..5702d25 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile +++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile @@ -25,7 +25,7 @@ bob: compile compile: $(JAVA_CLASSES) pitytest %.class: %.java - cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< + cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< clean: rm -f $(JAVA_CLASSES) \ No newline at end of file diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile index 566a944..cfa1548 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile +++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile @@ -23,7 +23,7 @@ run: compile compile: $(JAVA_CLASSES) pitytest %.class: %.java - cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< + cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< clean: rm -f $(JAVA_CLASSES) diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile index ebfd10e..e02b539 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile +++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile @@ -22,7 +22,7 @@ run: compile compile: $(JAVA_CLASSES) pitytest %.class: %.java - cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< + cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< clean: rm -f $(JAVA_CLASSES) diff --git a/test/java/foundation/pEp/pitytest/Makefile.conf b/test/java/foundation/pEp/pitytest/Makefile.conf index 51eae4a..6a7df96 100644 --- a/test/java/foundation/pEp/pitytest/Makefile.conf +++ b/test/java/foundation/pEp/pitytest/Makefile.conf @@ -1,9 +1,11 @@ JAVA_PKG_BASENAME=foundation.pEp JAVA_PKG_BASEPATH=foundation/pEp CLASSPATH=. +JAVAC_CMD=javac -encoding UTF-8 JAVA=java -enableassertions JAVA_CWD=../../../ + JAVA_CLASSES_PITYTEST= \ TestSuite.class \ TestUnit.class \ diff --git a/test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile b/test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile index 5586816..d36de9d 100644 --- a/test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile +++ b/test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile @@ -23,7 +23,7 @@ run: compile compile: $(JAVA_CLASSES) pitytest %.class: %.java - cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< + cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< clean: rm -f $(JAVA_CLASSES) diff --git a/test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile b/test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile index 27efb57..035fab6 100644 --- a/test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile +++ b/test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile @@ -23,7 +23,7 @@ run: compile compile: $(JAVA_CLASSES) pitytest %.class: %.java - cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< + cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< clean: rm -f $(JAVA_CLASSES) diff --git a/test/java/foundation/pEp/pitytest/examples/helloworld/Makefile b/test/java/foundation/pEp/pitytest/examples/helloworld/Makefile index 4e02f47..2431ab4 100644 --- a/test/java/foundation/pEp/pitytest/examples/helloworld/Makefile +++ b/test/java/foundation/pEp/pitytest/examples/helloworld/Makefile @@ -23,7 +23,7 @@ run: compile compile: $(JAVA_CLASSES) pitytest %.class: %.java - cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< + cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< clean: rm -f $(JAVA_CLASSES) diff --git a/test/java/foundation/pEp/pitytest/examples/testsuite/Makefile b/test/java/foundation/pEp/pitytest/examples/testsuite/Makefile index 987f50b..66009d0 100644 --- a/test/java/foundation/pEp/pitytest/examples/testsuite/Makefile +++ b/test/java/foundation/pEp/pitytest/examples/testsuite/Makefile @@ -23,7 +23,7 @@ run: compile compile: $(JAVA_CLASSES) pitytest %.class: %.java - cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< + cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$< clean: rm -f $(JAVA_CLASSES)