Skip to content

Commit

Permalink
Moving LIB_DIR visible for all make process (#480)
Browse files Browse the repository at this point in the history
Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
  • Loading branch information
sophia-guo committed Dec 12, 2023
1 parent 61b3121 commit 764621d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
11 changes: 11 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,24 @@ export JAVA_HOME := $(TEST_JDK_HOME)
$(info JAVA_HOME is set to $(JAVA_HOME))
endif




D = /
MKTREE = mkdir -p
SUBDIRS = ..

ifndef TEST_ROOT
TEST_ROOT := $(shell pwd)$(D)..
endif
ifndef LIB_DIR
LIB_DIR:=$(TEST_ROOT)$(D)TKG$(D)lib
endif
ifeq ($(CYGWIN),1)
LIB_DIR:=$(shell cygpath -w $(LIB_DIR))
endif
LIB_DIR:=$(subst \,/,$(LIB_DIR))


_TESTTARGET = $(firstword $(MAKECMDGOALS))
TESTTARGET = $(patsubst _%,%,$(_TESTTARGET))
Expand Down
7 changes: 0 additions & 7 deletions settings.mk
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,6 @@ endif
#######################################
# common dir and jars
#######################################
ifndef LIB_DIR
LIB_DIR:=$(TEST_ROOT)$(D)TKG$(D)lib
endif
ifeq ($(CYGWIN),1)
LIB_DIR:=$(shell cygpath -w $(LIB_DIR))
endif
LIB_DIR:=$(subst \,/,$(LIB_DIR))

TESTNG=$(LIB_DIR)$(D)testng.jar$(P)$(LIB_DIR)$(D)jcommander.jar
RESOURCES_DIR=$(JVM_TEST_ROOT)$(D)TestConfig$(D)resources
Expand Down

0 comments on commit 764621d

Please sign in to comment.