Changeset 8721 for trunk/testsuite

Timestamp:

Jun 20, 2002, 1:16:55 AM (23 years ago)

Author:

bird

Message:

Restructured testcase execution a bit.

Location:

trunk/testsuite/cui

Files:

• Makefile (modified) (2 diffs)
• doxygen.mak (modified) (6 diffs)

trunk/testsuite/cui/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.2 2002-06-19 02:14:49 bird Exp $
+# $Id: Makefile,v 1.3 2002-06-19 23:16:55 bird Exp $
 
 #
@@ -5 +5 @@
 #
 
-#
-# TODO:
-#  - Run all testcases nomatter who's failing.
-#  - Do proper logging of the results.
-#
-
 # Include the setup.mak
 PATH_ROOT = ..\..
 !include $(PATH_ROOT)\$(BUILD_SETUP_MAK)
+!include $(PATH_MAKE)\testsuite.tools.mk
 
 # Target Config
-TARGET_MODE = EMPTY
+TARGET_MODE = TESTCASE
+TARGET_NAME = CUI
 
-# Subdirs to process.
-POSTMAKEFILES = \
-    doxygen.mak \
+# Makefiles
+TESTCASE_MAKEFILES = \
+DoxyGen.mak \
+# watcomc.mak \
+# vac42.mak \
+# vac50.mak \
+# vac60.mak \
+# php.mak \
+# mysql.mak \
+# mysqld.mak \
+# mp3encoder.mak \
+# ghostscript.mak \
+# TeX.mak \
+# jikes.mak \
+# javac.mak \
+# java.mak \
+# gbm.mak \
+# gdlib.mak \
+# libtiff.mak \
+# 4nt.mak \
+# regina.mak \
+# orexx.mak \
+# zip.mak \
+# sti.mak (http://setiathome.ssl.berkeley.edu/stats/team/team_1331.html)
+
+# SubDirs
+#TESTCASE_SUBDIRS =
+
 
 # Include the process rulez.
 !include $(MAKE_INCLUDE_PROCESS)
 
+#
+# Make everything as quiet as possible.
+#
+!if [set BUILD_QUIET=1]
+!endif
+!if [set BUILD_VERBOSE=]
+!endif
 
+
+#
+# The testcase rule.
+#
+testcase:
+!if "$(MAKE_INCLUDE_PROCESS:process.forwarder=)" == "$(MAKE_INCLUDE_PROCESS)"
+    @echo CUI testcases: >> $(TS_LOGFILE)
+    $(TOOL_DOMAKES) "$(TESTCASE_MAKEFILES)" $(TOOL_MAKE) $@
+    $(TOOL_DODIRS) "$(TESTCASE_SUBDIRS)" $(TOOL_MAKE) -f $(BUILD_MAKEFILE) $@
+    @echo CUI testcases completed >> $(TS_LOGFILE)
+!else
+! ifndef BUILD_VERBOSE
+    @ \
+! endif
+    $(TOOL_BUILDENV) $(BUILD_ENVS_CHANGE) * $(TOOL_MAKE) -f $(MAKEFILE) $@
+!endif
+

trunk/testsuite/cui/doxygen.mak

@@ -1 @@
-# $Id: doxygen.mak,v 1.1 2002-06-19 01:59:27 bird Exp $
+# $Id: doxygen.mak,v 1.2 2002-06-19 23:16:36 bird Exp $
 
 #
@@ -12 +12 @@
 !include $(PATH_MAKE)\testsuite.tools.mk
 
+
 # Testsuite config for the process include.
 TARGET_MODE = TESTCASE
@@ -33 +34 @@
 # Main rule, this runs all the other rulez.
 #
-testcase:   testcase-banner \
-            $(BIN_FILES) \
-            testcase-help \
-            testcase-kFileFormatBase
+testcase:   $(BIN_FILES)
+    @$(ECHO) + Running testcases for DoxyGen v1.2.16! $(CLRRST)
+    $(TS_EXEC_1) "help" $(TS_EXEC_2) testcase-help
+    $(TS_EXEC_1) "kFileFormatBase" $(TS_EXEC_2) testcase-kFileFormatBase
     @$(ECHO) + Completed DoxyGen v1.2.16! $(CLRRST)
-
-testcase-banner:
-    @$(ECHO) + Running testcases for DoxyGen v1.2.16! $(CLRRST)
-
 
 
@@ -48 +45 @@
 # BUGBUG: why doesn't DOXYGEN.EXE output an absolute path?
 #
-testcase-help: testcase-help-banner $(PATH_TARGET)\doxygen.help.stdout
+testcase-help: $(PATH_TARGET)\doxygen.help.stdout
     -1 $(TS_PEC) $(DOXYGEN) --help > $(PATH_TARGET)\stdout 2> $(PATH_TARGET)\stderr
     $(TS_TEST_FILE_Z)   $(PATH_TARGET)\stderr
     $(TS_TEST_FILE_NZ)  $(PATH_TARGET)\stdout
     $(TS_SED) "s/ [.][.].*\\doxygen.exe/ DOXYGEN.EXE/I" $(PATH_TARGET)\stdout | $(TS_CMP) - $(PATH_TARGET)\doxygen.help.stdout
-    @$(ECHO) ++ help done!$(CLRRST)
-
-testcase-help-banner:
-    @$(ECHO) ++ help$(CLRRST)
 
 # This is the output of testcase-help
@@ -97 +90 @@
 # Testcase where we try to run doxygen on tools/common/kFileFormatBase.[cpp|h].
 #
-testcase-kFileFormatBase: testcase-kFileFormatBase-banner \
+testcase-kFileFormatBase: \
             $(PATH_TARGET)\kFileFormatBase.conf \
             $(PATH_TARGET)\kFileFormatBase.stdout \
@@ -113 +106 @@
     $(TS_TEST_DIR) $(PATH_TARGET)\man\man3
     $(TS_TEST_FILE_NZ) $(PATH_TARGET)\man\man3\kFileFormatBase.3
-    @$(ECHO) * kFileFormatBase done!$(CLRRST)
-
-testcase-kFileFormatBase-banner:
-    @$(ECHO) * kFileFormatBase$(CLRRST)