Merge pull request #479 from llxia/test1

Pass LIB_DIR in genParallelList
adoptium · Dec 7, 2023 · 61b3121 · 61b3121
2 parents 1573e73 + 1d8edfa
commit 61b3121
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/makeGen.mk b/makeGen.mk
@@ -28,7 +28,7 @@ P=:
 Q="
 
 TKG_JAR = .$(D)bin$(D)TestKitGen.jar
-JSON_SIMPLE = .$(D)lib$(D)json-simple.jar
+JSON_SIMPLE = $(LIB_DIR)$(D)json-simple.jar
 
 ifneq (,$(findstring Win,$(OS)))
 CURRENT_DIR := $(subst \,/,$(CURRENT_DIR))

diff --git a/makefile b/makefile
@@ -120,7 +120,7 @@ _failed:
 # generate parallel list
 #######################################
 genParallelList: envDetect
- $(MAKE) -f makeGen.mk AUTO_DETECT=$(AUTO_DETECT) MODE=parallelList NUM_MACHINES=$(NUM_MACHINES) TEST_TIME=$(TEST_TIME) TESTTARGET=$(TEST) TESTLIST=$(TESTLIST) TRSS_URL=$(TRSS_URL)
+ $(MAKE) -f makeGen.mk AUTO_DETECT=$(AUTO_DETECT) MODE=parallelList NUM_MACHINES=$(NUM_MACHINES) TEST_TIME=$(TEST_TIME) TESTTARGET=$(TEST) TESTLIST=$(TESTLIST) TRSS_URL=$(TRSS_URL) LIB_DIR=$(LIB_DIR)
 
 #######################################
 # clean