]> andersk Git - splint.git/commitdiff
andersk / splint.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eb6e183)
Got gmake to work on test suit. (Changed the cleanout grep so that it searches for...
authordrl7x <drl7x>
Mon, 14 Jan 2002 08:36:41 +0000 (08:36 +0000)
committerdrl7x <drl7x>
Mon, 14 Jan 2002 08:36:41 +0000 (08:36 +0000)
used grep -v to exclude hard coded default LARCH and LCLIMPORTDIR values form test output.

test/Makefile patch | blob | blame | history
test/Makefile.am patch | blob | blame | history
test/Makefile.in patch | blob | blame | history
test/db1.expect patch | blob | blame | history
test/db2.expect patch | blob | blame | history
test/help.expect patch | blob | blame | history
test/null6.lcd patch | blob | blame | history
test/tests2.5/newlint.lcd patch | blob | blame | history

diff --git a/test/Makefile b/test/Makefile
index d589c3c9646834d95c6d4639d6b10b83e65eb19d..2d98ccfc860fb521c0dd46efc769d48d35954bcb 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -141,7 +141,7 @@ SPLINTTESTS = $(UNITTESTS) $(SUBDIRTESTS)
 
 QUICKTESTS = db3
 
-CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
+CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "^gmake.*\[[1-9]*\]:" |   $(GREP) -v "^gmake -e" |  $(GREP) -v "^make -e" |$(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
 
 #drl 11/29/2001 This is a very ugly hack to get make dist to work
 EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
@@ -902,6 +902,7 @@ version:
        -$(SPLINTP) -help version
 
 .PHONY: help
+
 help:
        -@$(SPLINT)
        -@LARCH_PATH=/dev/null; $(SPLINT) -nof empty.lcl
@@ -910,6 +911,10 @@ help:
        -@$(SPLINTP) +boolint +boolint 
        -@$(SPLINTP) -help flags alpha
        -@$(SPLINTP) -help flags all
+       -@$(SPLINTP) -help flags full   | $(GREP) -v "    Path argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+       -@$(SPLINTP) -help flags manual  | $(GREP) -v "    Path argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+
+#larch and lclimportdir have different hardcoded default paths so don't include the path in the output..
 
 .PHONY: clean-local
 clean-local:
diff --git a/test/Makefile.am b/test/Makefile.am
index 877d8910ce2c8f0b388f5194e88f7d48b796678b..a0ccc84bb42130ff1e01e1aad6f245c5cb32f91a 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -74,6 +74,7 @@ version:
        -$(SPLINTP) -help version
 
 .PHONY: help
+
 help:
        -@$(SPLINT)
        -@LARCH_PATH=/dev/null; $(SPLINT) -nof empty.lcl
@@ -82,8 +83,11 @@ help:
        -@$(SPLINTP) +boolint +boolint 
        -@$(SPLINTP) -help flags alpha
        -@$(SPLINTP) -help flags all
-       -@$(SPLINTP) -help flags full
-       -@$(SPLINTP) -help flags manual
+       -@$(SPLINTP) -help flags full   | $(GREP) -v "    Path argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+       -@$(SPLINTP) -help flags manual  | $(GREP) -v "    Path argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+
+#larch and lclimportdir have different hardcoded default paths so don't include the path in the output..
+
 
 .PHONY: clean-local
 clean-local:
@@ -107,7 +111,7 @@ $(SPLINT):
 ## The tests should really be re-done as shell-scripts or something... maybe
 ##  autotest could be used once it's finished.
 
-CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
+CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "^gmake.*\[[1-9]*\]:" |   $(GREP) -v "^gmake -e" |  $(GREP) -v "^make -e" |$(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
 
 ## Not real C code
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 19d074d4eeb8b0b26fddc3b605e6a3b4b58aa2c5..dc692e446eee84502ed070344f0de733cc37b5d8 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -141,7 +141,7 @@ SPLINTTESTS = $(UNITTESTS) $(SUBDIRTESTS)
 
 QUICKTESTS = db3
 
-CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
+CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "^gmake.*\[[1-9]*\]:" |   $(GREP) -v "^gmake -e" |  $(GREP) -v "^make -e" |$(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
 
 #drl 11/29/2001 This is a very ugly hack to get make dist to work
 EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
@@ -902,6 +902,7 @@ version:
        -$(SPLINTP) -help version
 
 .PHONY: help
+
 help:
        -@$(SPLINT)
        -@LARCH_PATH=/dev/null; $(SPLINT) -nof empty.lcl
@@ -910,8 +911,10 @@ help:
        -@$(SPLINTP) +boolint +boolint 
        -@$(SPLINTP) -help flags alpha
        -@$(SPLINTP) -help flags all
-       -@$(SPLINTP) -help flags full
-       -@$(SPLINTP) -help flags manual
+       -@$(SPLINTP) -help flags full   | $(GREP) -v "    Path argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+       -@$(SPLINTP) -help flags manual  | $(GREP) -v "    Path argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+
+#larch and lclimportdir have different hardcoded default paths so don't include the path in the output..
 
 .PHONY: clean-local
 clean-local:
diff --git a/test/db1.expect b/test/db1.expect
index 093d628c35715751f694e4ed09f8be7dcdacf146..4a2e17d94c71e8d70766fe9c4ab9cfd545e28ee2 100644 (file)
--- a/test/db1.expect
+++ b/test/db1.expect
@@ -1,5 +1,3 @@
-make -e clean
-make -e check
 
 employee.c: (in function employee_equal)
 employee.c:25: Function strncmp expects arg 3 to be size_t gets int:
diff --git a/test/db2.expect b/test/db2.expect
index bb0cd6d97516db32d772c8f069d4e4c9e0dd323c..d8b1b5fc2f55134fadf5c75352ef963861b5fa7e 100644 (file)
--- a/test/db2.expect
+++ b/test/db2.expect
@@ -1,5 +1,3 @@
-make -e clean
-make -e check
 
 employee.c: (in function employee_setName)
 employee.c:17: Parameter 1 (e->name) to function strcpy is declared unique but
diff --git a/test/help.expect b/test/help.expect
index f2e65b83ceca79a4518bb0713b4c46b3bc8628ea..b151e51908373ce153fb02f52b94376ff4bba701 100644 (file)
--- a/test/help.expect
+++ b/test/help.expect
@@ -2653,9 +2653,8 @@ larchpath
    Categories: directories, files
    Default Setting: -
    Set globally only
-*** Note: possible difference in the test result because of the default path here:
-   Path argument.  Default: .:/usr/local/share/splint/lib:/af10/evans/LCLintDev/
-   lib:
+   Path argument.  Default: .:/usr/local/share/splint/lib:/af9/drl7x/reTmp/LCLin
+   tDev/lib:
    
 lclexpect
    expect <int> spec errors
@@ -2669,9 +2668,8 @@ lclimportdir
    Categories: directories, files
    Default Setting: -
    Set globally only
-*** Note: possible difference in the test result because of the default path here:
-   Directory argument.  Default: .:/usr/local/share/splint/imports:/af10/evans/L
-   CLintDev/imports
+   Directory argument.  Default: .:/usr/local/share/splint/imports:/af9/drl7x/re
+   Tmp/LCLintDev/imports
    
 lcs
    generate .lcs files
@@ -5644,14 +5642,12 @@ directories
 ===================================
 tmpdir <directory> [/tmp/]: <G><P:->
    Set directory for writing temp files.
-*** Note: possible difference in the test result because of the default path here:
-larchpath <path> [.:/usr/local/share/splint/lib:/af10/evans/LCLintDev/lib:]:
-<G><P:->
+larchpath <path> [.:/usr/local/share/splint/lib:/af9/drl7x/reTmp/LCLintDev/lib:]
+: <G><P:->
    Set path for searching for library files (overrides LARCH_PATH environment
    variable).
-*** Note: possible difference in the test result because of the default path here:
-lclimportdir <directory> [.:/usr/local/share/splint/imports:/af10/evans/LCLintDe
-v/imports]: <G><P:->
+lclimportdir <directory> [.:/usr/local/share/splint/imports:/af9/drl7x/reTmp/LCL
+intDev/imports]: <G><P:->
    Set directory to search for LCL import files (overrides LCLIMPORTDIR).
 sysdirs <path> [/usr/]: <G><P:->
    Set directories for system files (default /usr/include). Separate
diff --git a/test/null6.lcd b/test/null6.lcd
index 86cd71b31470c406acb742eadc73d8ee6a3549f9..4484442bd3905df386a40e5f9737eabd25cb2e37 100644 (file)
--- a/test/null6.lcd
+++ b/test/null6.lcd
@@ -1,5 +1,5 @@
 ;;; Splint Library  null6.lcd
-;;Splint 3.0.1.2 --- 10 Jan 2002
+;;Splint 3.0.1.2 --- 14 Jan 2002
 ;;lib:298
 ;;ctTable
 0 u-2 19 38
diff --git a/test/tests2.5/newlint.lcd b/test/tests2.5/newlint.lcd
index 07e9513ddebb9880e5fa4a7ff88af2a3639fbc4d..07892eb264c65b3f443c932bc92d7ad5e4be6efd 100644 (file)
--- a/test/tests2.5/newlint.lcd
+++ b/test/tests2.5/newlint.lcd
@@ -1,5 +1,5 @@
 ;;; Splint Library  newlint.lcd
-;;Splint 3.0.1.2 --- 10 Jan 2002
+;;Splint 3.0.1.2 --- 14 Jan 2002
 ;;lib:298
 ;;ctTable
 0 u-2 19 38
git-cvsimport mirror of splint
This page took 1.014816 seconds and 5 git commands to generate.