Changeset 9

Timestamp:

Jul 11, 2011, 8:04:47 PM (14 years ago)

Author:

cla

Message:

rdfint

• reworked phony targets in unittest makefile
• added support for RDF testcases

Location:

php/trunk/unittest

Files:

• help.txt (modified) (1 diff)
• makefile (modified) (2 diffs)

php/trunk/unittest/help.txt

@@ -4 +4 @@
  Valid targets/symbols:
 
-   help            - display this help
-   all             - execute all unittests
-   TESTCASE=<name> - execute specific testcase
+   help                - display this help
+   list                - list names of testcases
 
+   all                 - execute all testcases (lib && rdf)
+
+   lib                 - execute all library testcases
+   lib TESTCASE=<name> - execute specified library testcase
+
+   rdf                 - execute all of selected RDF testcases of W3C
+   rdf TESTCASE=<name> - execute specified RDF testcase
+
+
+

php/trunk/unittest/makefile

@@ -16 +16 @@
 #  limitations under the License.
 
-# CONFIGURE HERE
+# ----- CONFIGURE HERE
 
+
+# -- test script in subdirectories
 TESTSCRIPT=unittest.php
+
+# -- selected W3C testcases, to be executed by rdftestcases/$(TESTSCRIPT)
+RDFTESTCASES= \
+amp-in-url/test001 \
+datatypes/test001  \
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -31 +38 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-#       @for i in `find . -maxdepth 1 -type d` do echo $(i)
 # --- phony targets
 
-.PHONY: help all changedir
+.PHONY: help all lib rdf changedir
 
-
-ifneq ($(TESTCASE),)
-all:
-        -@make -s SUBDIR=$(TESTCASE) changedir
-else
+# - - - - - - - - - - - - - - - - - -
 
 help:
         @$(CAT) help.txt
-
+        
+list:
+        @echo Available library testcases:
 ifeq ($(OS), Windows_NT)
-all:
-        -@for /d %%a in (*) do @make -s SUBDIR=%%a changedir
+        -@for /d %%c in (*_*) do @echo    %%c
 else
-all:
-        -@for d in `find . -maxdepth 1 -type d`; do make -s SUBDIR=$$d changedir; done
+        -@for c in `find . -maxdepth 1 -type d -path "./*_*"` ; do echo "   " $$c; done
 endif
+        @echo Available RDF Testcases:
+ifeq ($(OS), Windows_NT)
+        -@for /d %%c in ($(RDFTESTCASES)) do @echo    %%c
+else
+        -@for c in $(RDFTESTCASES); do echo "   " $$c; done
 endif
 
+
+all: lib rdf
+
+# - - - - - - - - - - - - - - - - - -
+
+# execute library specifc testcases
+
+lib:
+ifeq ($(TESTCASE),)
+ifeq ($(OS), Windows_NT)
+        -@for /d %%c in (*) do @make -s TESTCASE=%%c SUBDIR=%%c changedir
+else
+        -@for c in `find . -maxdepth 1 -type d -path "./*_*"`; do make -s TESTCASE=$$c SUBDIR=$$c changedir; done
+endif
+else
+        -@make -s TESTCASE=$(TESTCASE) SUBDIR=$(TESTCASE) changedir
+endif
+
+# - - - - - - - - - - - - - - - - - -
+
+# execute selected W3C RDF testcases
+
+rdf:
+ifeq ($(TESTCASE),)
+ifeq ($(OS), Windows_NT)
+        -@for /d %%c in ($(RDFTESTCASES)) do @make -s TESTCASE=%%c SUBDIR=rdftestcases changedir
+else
+        -@for d in $(RDFTESTCASES); do make -s TESTCASE=$$d SUBDIR=rdftestcases changedir; done
+endif
+else
+        @make -s TESTCASE=$(TESTCASE) SUBDIR=rdftestcases changedir
+endif
+
+# - - - - - - - - - - - - - - - - - -
+
+# this target to change into the subdirectory of the testcase
 changedir:
-ifneq ($(SUBDIR), .)
-ifneq ($(SUBDIR), ./.svn)
-        make -s --directory $(SUBDIR) SUBDIR=$(SUBDIR) -f ../makefile run
-endif
-endif
+        make -s --directory $(SUBDIR) TESTCASE=$(TESTCASE) -f ../makefile run
+
+# - - - - - - - - - - - - - - - - - -
+
+# this target to finally execute the testcase
 
 run:
         @echo =====================================
-        @echo $(SUBDIR)
         @phpunit $(TESTSCRIPT)