Remove unnecessory macros

clean.mk

@@ -14,7 +14,7 @@
 
 .DEFAULT_GOAL := clean
 
-D = /
+include common.mk
 
 ifndef TEST_ROOT
 	TEST_ROOT := $(shell pwd)$(D)..

common.mk

@@ -0,0 +1,4 @@
+D = /
+P = :
+Q = "
+SQ = '

compile.mk

@@ -14,7 +14,7 @@
 
 .DEFAULT_GOAL := compile
 
-D = /
+include common.mk
 
 ifndef TEST_ROOT
 	TEST_ROOT := $(shell pwd)$(D)..
@@ -34,4 +34,4 @@ compile:
 	($(COMPILE_CMD) 2>&1; echo $$? ) | tee $(Q)$(COMPILATION_LOG)$(Q); \
 	$(MOVE_TDUMP)
 
-.PHONY: compile
+.PHONY: compile

makeGen.mk

@@ -23,9 +23,7 @@ help:
 CURRENT_DIR := $(shell pwd)
 OPTS=
 
-D=/
-P=:
-Q="
+include common.mk
 
 TKG_JAR = .$(D)bin$(D)TestKitGen.jar
 JSON_SIMPLE = .$(D)lib$(D)json-simple.jar

moveDmp.mk

@@ -12,8 +12,7 @@
 # limitations under the License.
 ##############################################################################
 
-D = /
-Q = "
+include common.mk
 
 ifndef TEST_ROOT
 	TEST_ROOT := $(shell pwd)$(D)..

runtest.mk

@@ -18,7 +18,7 @@
 
 .DEFAULT_GOAL := test
 
-D = /
+include common.mk
 
 SUBDIRS = ..
 

settings.mk

@@ -35,13 +35,12 @@ EXECUTABLE_SUFFIX =
 RUN_SCRIPT = sh
 RUN_SCRIPT_STRING = "sh -c"
 SCRIPT_SUFFIX=.sh
-Q="
-SQ='
-P=:
 AND_IF_SUCCESS=&&
 PROPS_DIR=props_unix
 TOTALCOUNT := 0
 
+include common.mk
+
 -include $(TEST_ROOT)$(D)TKG$(D)autoGenEnv.mk
 include $(TEST_ROOT)$(D)TKG$(D)envSettings.mk
 -include $(TEST_ROOT)$(D)TKG$(D)utils.mk
@@ -84,7 +83,7 @@ ifndef JVM_VERSION
 
 ifeq (hotspot, $(JDK_IMPL))
 	JVM_VERSION = $(OPENJDK_VERSION)
-else 
+else
 	JVM_VERSION = $(OPENJDK_VERSION)-$(JDK_IMPL)
 endif
 
@@ -95,7 +94,7 @@ ifneq (,$(findstring win,$(SPEC)))
 P=;
 D=\\
 EXECUTABLE_SUFFIX=.exe
-RUN_SCRIPT="cmd /c" 
+RUN_SCRIPT="cmd /c"
 RUN_SCRIPT_STRING=$(RUN_SCRIPT)
 SCRIPT_SUFFIX=.bat
 PROPS_DIR=props_win
@@ -195,7 +194,7 @@ KEEP_REPORTDIR?=true
 ifeq ($(KEEP_REPORTDIR), false)
 	RM_REPORTDIR=$(RM) -r $(REPORTDIR);
 endif
-ifeq ($(TEST_ITERATIONS), 1) 
+ifeq ($(TEST_ITERATIONS), 1)
 	TEST_STATUS=if [ $$? -eq 0 ] ; then $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_PASSED$(Q); $(ECHO) $(Q)$(Q); $(CD) $(TEST_ROOT); $(RM_REPORTDIR) else $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_FAILED$(Q); $(ECHO) $(Q)$(Q); fi
 else
 	TEST_STATUS=if [ $$? -eq 0 ] ; then $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_PASSED(ITER_$$itercnt)$(Q); $(ECHO) $(Q)$(Q); $(CD) $(TEST_ROOT); $(RM_REPORTDIR) if [ $$itercnt -eq $(TEST_ITERATIONS) ] ; then $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_PASSED$(Q); $(ECHO) $(Q)$(Q); fi else $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_FAILED(ITER_$$itercnt)$(Q); $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_FAILED$(Q); $(ECHO) $(Q)$(Q); exit 1; fi