Merge pull request #5054 from Yuehan-Lin/autoBool

Changed AUTO_DETECT variable from on/off into true/false
eclipse-openj9 · Mar 12, 2019 · 15c5880 · 15c5880
2 parents 1b67870 + 105ed11
commit 15c5880
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/test/TestConfig/envSettings.mk b/test/TestConfig/envSettings.mk
@@ -28,7 +28,7 @@
 
 HOTSPOT_IMPLS=$(or hotspot,sap)
 
-ifneq ($(AUTO_DETECT), off) 
+ifneq ($(AUTO_DETECT), false) 
     ifndef SPEC
         export SPEC:=$(DETECTED_SPEC)
     else
@@ -66,13 +66,13 @@ ifneq ($(AUTO_DETECT), off)
 	endif
 else
     ifndef SPEC
-        $(error Please export AUTO_DETECT=on or export SPEC value manually (i.e., export SPEC=linux_x86-64_cmprssptrs))
+        $(error Please export AUTO_DETECT=true or export SPEC value manually (i.e., export SPEC=linux_x86-64_cmprssptrs))
     endif
     ifndef JDK_VERSION
-        $(error Please export AUTO_DETECT=on or export JDK_VERSION value manually (i.e., export JDK_VERSION=8))
+        $(error Please export AUTO_DETECT=true or export JDK_VERSION value manually (i.e., export JDK_VERSION=8))
     endif
     ifndef JDK_IMPL
-        $(error Please export AUTO_DETECT=on or export JDK_IMPL value manually (i.e., export JDK_IMPL=openj9))
+        $(error Please export AUTO_DETECT=true or export JDK_IMPL value manually (i.e., export JDK_IMPL=openj9))
     endif
 endif
 
diff --git a/test/TestConfig/run_configure.mk b/test/TestConfig/run_configure.mk
@@ -33,10 +33,10 @@ ifneq (,$(findstring jre,$(JAVA_BIN)))
 endif
 
 testconfig:
-ifneq ($(AUTO_DETECT), off)
-	@echo "AUTO_DETECT is turned on"
+ifneq ($(AUTO_DETECT), false)
+	@echo "AUTO_DETECT is set to true"
 	ant -f ./src/build_envInfo.xml -DJAVA_BIN=$(JAVA_BIN) -DJAVAC=$(JAVAC)
 else
-	@echo "AUTO_DETECT is turned off"
+	@echo "AUTO_DETECT is set to false"
 endif
 	$(MAKE) -f makeGen.mk AUTO_DETECT=$(AUTO_DETECT)
diff --git a/test/docs/OpenJ9TestUserGuide.md b/test/docs/OpenJ9TestUserGuide.md
@@ -60,13 +60,13 @@ tools should be installed on your test machine to run tests.
   * auto detection:
   
     By default, AUTO_DETECT is turned on. SPEC, JDK_VERSION, and JDK_IMPL do not need to be exported.
-    If you wish to turn off AUTO_DETECT and export SPEC, JDK_VERSION, and JDK_IMPL manually, you can turn off AUTO_DETECT.
+    If you do not wish to use AUTO_DETECT and export SPEC, JDK_VERSION, and JDK_IMPL manually, you can export AUTO_DETECT to false.
     ```
-    export AUTO_DETECT=off
+    export AUTO_DETECT=false
     ```
     e.g.,
     ```
-    export AUTO_DETECT=off
+    export AUTO_DETECT=false
     export SPEC=linux_x86-64_cmprssptrs
     export JDK_VERSION=8
     export JDK_IMPL=openj9