diff --git a/makeGen.mk b/makeGen.mk index 1b3fec2e..4db53d59 100644 --- 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 index 5865c582..850d6608 100644 --- 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