[[ Tests ]] Specify log file as environment variable

livecodeali · livecodeali · commit 1b27df19875d · 2017-01-20T22:25:44.000Z
diff --git a/tests/Makefile b/tests/Makefile
@@ -49,6 +49,8 @@ LCC_LOG = _compiler_test_suite.log
 LC_RUN_TESTS ?= $(top_srcdir)/tests/_lcruntests.livecodescript
 LC_RUN_TEST_CMD = $(LCS_ENGINE) -ui $(LC_RUN_TESTS)
 
+LC_RUN_LOG = _lc_run_test_suite.log
+
 ########## Java FFI DSL test parameters
 
 JAVA_DSL_PARSER ?= $(bin_dir)/java-dsl-parse
@@ -129,7 +131,8 @@ $(LCM_DIR)/%.lcm: %.lcb | $(LCM_DIR)
 
 lcs-check: $(LCS_ENGINE) lcm_compile
 	@rm -f $(LCS_LOG)
-	@cmd="$(LCS_CMD)"; \
+	@export TEST_SUITE_LOG_FILE="$(LCS_LOG)"; \
+	cmd="$(LCS_CMD)"; \
 	echo "$$cmd" $(_PRINT_RULE); \
 	$$cmd
 
@@ -143,6 +146,7 @@ compiler-check: $(LC_COMPILE)
 	@rm -f $(LCC_LOG)
 	@export LC_COMPILE="$(LC_COMPILE)"; \
 	export LCC_VERBOSE="$(LCC_VERBOSE)"; \
+	export TEST_SUITE_LOG_FILE="$(LCC_LOG)"; \
 	cmd="$(LCC_CMD)"; \
 	echo "$$cmd" $(_PRINT_RULE); \
 	$$cmd
@@ -154,6 +158,7 @@ compiler-check: $(LC_COMPILE)
 lc-run-check: $(LC_RUN) lcm_compile
 	@export LC_RUN="$(LC_RUN)"; \
 	export LCM_DIR="$(LCM_DIR)/lc-run"; \
+	export TEST_SUITE_LOG_FILE="$(LC_RUN_LOG)"; \
 	cmd="$(LC_RUN_TEST_CMD)"; \
 	echo "$$cmd" $(_PRINT_RULE); \
 	$$cmd
@@ -170,6 +175,7 @@ LC_RUN_FLAGS += -l $(LCB_TESTLIB)
 
 lcb-check: lcm_compile
 	@set -e; \
+	export TEST_SUITE_LOG_FILE="$(LCB_LOG)"; \
 	for lcbfile in $(LCM_TEST_SOURCES); do \
 	    lcmfile="$(LCM_DIR)/`echo $$lcbfile | sed -e 's:lcb$$:lcm:'`" ; \
 	    logfile="$(TEST_DIR)/`echo $$lcbfile | sed -e's:lcb$$:log:'`" ; \
@@ -191,7 +197,8 @@ lcb-check: lcm_compile
 java-ffi-dsl-check: $(JAVA_DSL_PARSE)
 	@rm -f $(JAVA_DSL_PARSER_LOG)
 	@export JAVA_DSL_PARSER="$(JAVA_DSL_PARSER)"; \
-	export JAVA_DSL_PARSE_VERBOSE="$(JAVA_DSL_PARSE_VERBOSE)"; \
+	export LCC_VERBOSE="$(JAVA_DSL_PARSE_VERBOSE)"; \
+	export TEST_SUITE_LOG_FILE="$(JAVA_DSL_PARSER_LOG)"; \
 	cmd="$(JAVA_DSL_PARSER_CMD)"; \
 	echo "$$cmd" $(_PRINT_RULE); \
 	$$cmd
diff --git a/tests/_compilertestrunner.livecodescript b/tests/_compilertestrunner.livecodescript
@@ -16,9 +16,6 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
--- FIXME provide this on the command line
-constant kLogFilename = "_compiler_test_suite.log"
-
 private function getTestRunnerBehavior
    -- Compute the filename of the compiler test runner behavior
    local tTestsPath, tStack
diff --git a/tests/_javadslparsertestrunner.livecodescript b/tests/_javadslparsertestrunner.livecodescript
@@ -16,9 +16,6 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
--- FIXME provide this on the command line
-constant kLogFilename = "_java_dsl_parser_test_suite.log"
-
 private function getTestRunnerBehavior
    -- Compute the filename of the compiler test runner behavior
    local tTestsPath, tStack
diff --git a/tests/_testrunner.livecodescript b/tests/_testrunner.livecodescript
@@ -16,9 +16,6 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
--- FIXME provide this on the command line
-constant kLogFilename = "_test_suite.log"
-
 private function getTestRunnerBehavior
    -- Compute the filename of the test runner
    local tTestsPath, tStack
diff --git a/tests/_testrunnerbehavior.livecodescript b/tests/_testrunnerbehavior.livecodescript
@@ -16,8 +16,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
--- FIXME provide this on the command line
-constant kLogFilename = "_test_suite.log"
+constant kDefaultLogFilename = "_test_suite.log"
 
 ----------------------------------------------------------------
 -- Top-level actions
@@ -99,7 +98,14 @@ private command doRun pInfo
    if the platform is "win32" then
       replace return with numToChar(13) & numToChar(10) in tLogForWriting
    end if
-   put tLogForWriting into url ("binfile:" & kLogFilename)
+   
+   local tLogFilename
+   put $TEST_SUITE_LOG_FILE into tLogFilename
+   if tLogFilename is empty then
+      put kDefaultLogFilename into tLogFilename
+   end if
+   
+   put tLogForWriting into url ("binfile:" & tLogFilename)
    
    if TesterTapGetWorstResult(tAnalysis) is "FAIL" then
       quit 1
