PEERDIR 4 test_tool
@@ -435,6 +435,7 @@ when ($NO_GPL == "yes") {
NO_GPL_FLAG=--no-gpl
}
NEED_PLATFORM_PEERDIRS=yes
+PEERDIR_TEST_TOOL=yes
PYTHON2=no
PYTHON3=no
@@ -612,7 +613,7 @@ module BASE_UNIT {
CFLAGS+=-DCYTHON_TRACE=1 -DCYTHON_TRACE_NOGIL=1
}
- when ($TESTS_REQUESTED && $NEED_PLATFORM_PEERDIRS == "yes") {
+ when ($PEERDIR_TEST_TOOL == "yes") {
PEERDIR+=build/platform/test_tool
}
@@ -1179,6 +1180,7 @@ module RESOURCES_LIBRARY: _LIBRARY {
.RESTRICTED=ALLOCATOR SIZE TAG DATA TEST_DATA DEPENDS FORK_TESTS FORK_SUBTESTS SPLIT_FACTOR TEST_CWD RUN TIMEOUT SRCS PEERDIR
SET(NEED_PLATFORM_PEERDIRS no)
+ SET(PEERDIR_TEST_TOOL no)
DISABLE(WITH_VALGRIND)
NO_CODENAVIGATION()
NO_PLATFORM()
@@ -3570,6 +3572,9 @@ module GO_PROGRAM: GO_BASE_UNIT {
}
PEERDIR(${GOSTD}/runtime)
+ when ($PEERDIR_TEST_TOOL == "yes") {
+ PEERDIR+=build/platform/test_tool
+ }
}
module GO_TEST: GO_PROGRAM {
@@ -3581,10 +3586,6 @@ module GO_TEST: GO_PROGRAM {
PEERDIR(${GOSTD}/testing)
ADD_YTEST($REALPRJNAME go.test)
-
- when ($TESTS_REQUESTED && $NEED_PLATFORM_PEERDIRS == "yes") {
- PEERDIR+=build/platform/test_tool
- }
}
JAVA_IGNORE_CLASSPATH_CLASH_VALUE=
