diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | tests/logger/GNUmakefile | 5 | ||||
| -rwxr-xr-x | tests/logger/Makefile.W32 | 1 | ||||
| -rwxr-xr-x | tests/logger/exec_test | 8 | ||||
| -rwxr-xr-x | tests/logger/exec_test.cmd | 15 | ||||
| -rw-r--r-- | tests/logger/test1.MUST | 5 |
6 files changed, 32 insertions, 3 deletions
@@ -18,6 +18,7 @@ *.dll.manifest *.exp *~ +*.log tests/*/test1 tests/*/test2 tests/*/test3 diff --git a/tests/logger/GNUmakefile b/tests/logger/GNUmakefile index 278a892..b0e2db0 100755 --- a/tests/logger/GNUmakefile +++ b/tests/logger/GNUmakefile @@ -21,10 +21,9 @@ local_all: local_clean: -@rm -f *.RES *.DIFF + -@rm -f test1.log local_distclean: local_test: -# @./exec_test test1 "TypeList and TypeTraits" -# @./exec_test test2 "TypeInfo C++ demangle" -# @./exec_test test3 "Singleton" + @./exec_test test1 "Logging" diff --git a/tests/logger/Makefile.W32 b/tests/logger/Makefile.W32 index cbc9e0e..abbad68 100755 --- a/tests/logger/Makefile.W32 +++ b/tests/logger/Makefile.W32 @@ -29,6 +29,7 @@ local_all: local_clean: @-erase -f *.RES *.DIFF *.ERR 2>NUL + @-erase test1.log 2>NUL local_distclean: diff --git a/tests/logger/exec_test b/tests/logger/exec_test new file mode 100755 index 0000000..d2d606f --- /dev/null +++ b/tests/logger/exec_test @@ -0,0 +1,8 @@ +#!/bin/sh + +BINARY=$1 +TITLE=$2 + +printf "$BINARY: $TITLE .. " +./$BINARY >$BINARY.RES 2>&1 +diff $BINARY.MUST $BINARY.RES > $BINARY.DIFF && printf "OK\n" || printf "ERROR\n" diff --git a/tests/logger/exec_test.cmd b/tests/logger/exec_test.cmd new file mode 100755 index 0000000..81a6222 --- /dev/null +++ b/tests/logger/exec_test.cmd @@ -0,0 +1,15 @@ +@echo off
+
+set BINARY=%1
+set TITLE=%2
+
+%BINARY% >%BINARY%.OUT 2>%BINARY%.ERR
+..\..\utils\win32\dos2unix <%BINARY%.OUT >%BINARY%.RES
+erase /q %BINARY%.OUT
+echo n | comp %BINARY%.MUST %BINARY%.RES > %BINARY%.DIFF 2>NUL
+if ERRORLEVEL 1 GOTO FAIL
+echo %BINARY%: %TITLE%.. OK
+goto END
+:FAIL
+echo %BINARY%: %TITLE% .. ERROR
+:END
diff --git a/tests/logger/test1.MUST b/tests/logger/test1.MUST new file mode 100644 index 0000000..07252ef --- /dev/null +++ b/tests/logger/test1.MUST @@ -0,0 +1,5 @@ +FATAL: fatal error +CRITICAL: critical error +ERROR: error +WARNING: warning +NOTICE: notice |