Changeset 66 for php

Timestamp:

Aug 7, 2011, 5:32:37 PM (14 years ago)

Author:

cla

Message:

• adapted main makefile to new rdftestcases makefile

Location:

php/trunk/unittest

Files:

• help.txt (modified) (1 diff)
• makefile (modified) (3 diffs)
• rdftestcases/makefile (modified) (2 diffs)
• rdftestcases/rdftestcases.php (modified) (1 diff)

php/trunk/unittest/help.txt

@@ -5 +5 @@
 
    help                - display this help
-   list                - list names of testcases
+   list                - list categories of testcases
 
    all                 - execute all unittests (lib && rdf)

php/trunk/unittest/makefile

@@ -21 +21 @@
 # -- test script in subdirectories
 TESTSCRIPT=unittest.php
-
-# -- selected W3C testcases, to be executed by rdftestcases/$(TESTSCRIPT)
-RDFTESTCASES= \
-amp-in-url/test001 \
-datatypes/test001 \
-datatypes/test002 \
-rdf-element-not-mandatory/test001 \
-rdfms-reification-required/test001 \
-rdfms-uri-substructure/test001 \
-rdfms-xmllang/test001 \
-rdfms-xmllang/test002 \
-rdfms-xmllang/test003 \
-rdfms-xmllang/test004 \
-rdfms-xmllang/test005 \
-rdfms-xmllang/test006 \
-unrecognised-xml-attributes/test001 \
-unrecognised-xml-attributes/test002 \
-rdf-charmod-literals/test001 \
-rdf-charmod-uris/test001 \
-rdf-charmod-uris/test002 \
-rdf-containers-syntax-vs-schema/test001 \
-rdf-containers-syntax-vs-schema/test002 \
-rdf-containers-syntax-vs-schema/test003 \
-rdf-containers-syntax-vs-schema/test004 \
-rdf-containers-syntax-vs-schema/test006 \
-rdf-containers-syntax-vs-schema/test007 \
-rdf-containers-syntax-vs-schema/test008 \
-rdf-ns-prefix-confusion/test0001 \
-rdf-ns-prefix-confusion/test0003 \
-rdf-ns-prefix-confusion/test0004 \
-rdf-ns-prefix-confusion/test0005 \
-rdf-ns-prefix-confusion/test0006 \
-rdf-ns-prefix-confusion/test0009 \
-rdf-ns-prefix-confusion/test0010 \
-rdf-ns-prefix-confusion/test0011 \
-rdf-ns-prefix-confusion/test0012 \
-rdf-ns-prefix-confusion/test0013 \
-rdf-ns-prefix-confusion/test0014 \
-rdfms-difference-between-ID-and-about/test1 \
-rdfms-difference-between-ID-and-about/test2 \
-rdfms-difference-between-ID-and-about/test3 \
-rdfms-duplicate-member-props/test001 \
-rdfms-empty-property-elements/test001 \
-rdfms-empty-property-elements/test002 \
-rdfms-empty-property-elements/test003 \
-rdfms-empty-property-elements/test004 \
-rdfms-empty-property-elements/test005 \
-rdfms-empty-property-elements/test006 \
-rdfms-empty-property-elements/test007 \
-rdfms-empty-property-elements/test008 \
-rdfms-empty-property-elements/test009 \
-rdfms-empty-property-elements/test010 \
-rdfms-empty-property-elements/test011 \
-rdfms-empty-property-elements/test012 \
-rdfms-empty-property-elements/test013 \
-rdfms-empty-property-elements/test014 \
-rdfms-empty-property-elements/test015 \
-rdfms-empty-property-elements/test016 \
-rdfms-empty-property-elements/test017 \
-rdfms-identity-anon-resources/test001 \
-rdfms-identity-anon-resources/test002 \
-rdfms-identity-anon-resources/test003 \
-rdfms-identity-anon-resources/test004 \
-rdfms-identity-anon-resources/test005 \
-rdfms-not-id-and-resource-attr/test001 \
-rdfms-not-id-and-resource-attr/test002 \
-rdfms-not-id-and-resource-attr/test004 \
-rdfms-not-id-and-resource-attr/test005 \
-rdfms-para196/test001 \
-rdfms-rdf-names-use/test-001 \
-rdfms-rdf-names-use/test-002 \
-rdfms-rdf-names-use/test-003 \
-rdfms-rdf-names-use/test-004 \
-rdfms-rdf-names-use/test-005 \
-rdfms-rdf-names-use/test-006 \
-rdfms-rdf-names-use/test-007 \
-rdfms-rdf-names-use/test-008 \
-rdfms-rdf-names-use/test-009 \
-rdfms-rdf-names-use/test-010 \
-rdfms-rdf-names-use/test-011 \
-rdfms-rdf-names-use/test-012 \
-rdfms-rdf-names-use/test-013 \
-rdfms-rdf-names-use/test-014 \
-rdfms-rdf-names-use/test-015 \
-rdfms-rdf-names-use/test-016 \
-rdfms-rdf-names-use/test-017 \
-rdfms-rdf-names-use/test-018 \
-rdfms-rdf-names-use/test-019 \
-rdfms-rdf-names-use/test-020 \
-rdfms-rdf-names-use/test-021 \
-rdfms-rdf-names-use/test-022 \
-rdfms-rdf-names-use/test-023 \
-rdfms-rdf-names-use/test-024 \
-rdfms-rdf-names-use/test-025 \
-rdfms-rdf-names-use/test-026 \
-rdfms-rdf-names-use/test-027 \
-rdfms-rdf-names-use/test-028 \
-rdfms-rdf-names-use/test-029 \
-rdfms-rdf-names-use/test-030 \
-rdfms-rdf-names-use/test-031 \
-rdfms-rdf-names-use/test-032 \
-rdfms-rdf-names-use/test-033 \
-rdfms-rdf-names-use/test-034 \
-rdfms-rdf-names-use/test-035 \
-rdfms-rdf-names-use/test-036 \
-rdfms-rdf-names-use/test-037 \
-rdfms-seq-representation/test001 \
-rdfms-syntax-incomplete/test001 \
-rdfms-syntax-incomplete/test002 \
-rdfms-syntax-incomplete/test003 \
-rdfms-syntax-incomplete/test004 \
-xmlbase/test001 \
-xmlbase/test002 \
-xmlbase/test003 \
-xmlbase/test004 \
-xmlbase/test006 \
-xmlbase/test007 \
-xmlbase/test008 \
-xmlbase/test009 \
-xmlbase/test010 \
-xmlbase/test011 \
-xmlbase/test013 \
-xmlbase/test014 \
-# FAIL rdfms-xml-literal-namespaces/test001 \
-# FAIL rdfms-xml-literal-namespaces/test002 \
-rdfs-domain-and-range/test001 \
-rdfs-domain-and-range/test002 \
-rdfs-no-cycles-in-subClassOf/test001 \
-rdfs-no-cycles-in-subPropertyOf/test001 \
-rdfs-subPropertyOf-semantics/test001 \
-
-
-# failing tescases, to be examined by maintainer
-RDFTESTCASES_FAIL= \
-xml-canon/test001 \
-rdfms-xml-literal-namespaces/test001 \
-rdfms-xml-literal-namespaces/test002 \
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -189 +52 @@
 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
-
+        @make -s -C rdftestcases list
 
 # - - - - - - - - - - - - - - - - - -
@@ -217 +75 @@
 rdf:
 ifeq ($(TESTCASE),)
-ifeq ($(OS), Windows_NT)
-        -@for /d %%c in ($(RDFTESTCASES)) do @make -s TESTCASE=%%c SUBDIR=rdftestcases run
+        @make -s -C rdftestcases all
 else
-        -@for d in $(RDFTESTCASES); do make -s TESTCASE=$$d SUBDIR=rdftestcases run; done
-endif
-else
-        @make -s TESTCASE=$(TESTCASE) SUBDIR=rdftestcases run
-endif
-
-# - - - - - - - - - - - - - - - - - -
-
-# for maintainers only
-# execute all failing W3C RDF testcases
-
-rdffail:
-ifeq ($(OS), Windows_NT)
-        -@for /d %%c in ($(RDFTESTCASES_FAIL)) do @make -s TESTCASE=%%c SUBDIR=rdftestcases run
-else
-        -@for d in $(RDFTESTCASES_FAIL); do make -s TESTCASE=$$d SUBDIR=rdftestcases run; done
+        @make -s -C rdftestcases TESTCASE=$(TESTCASE)
 endif
 

php/trunk/unittest/rdftestcases/makefile

@@ -43 +43 @@
 # - - - - - - - - - - - - - - - - - -
 
+
+ifneq ($(TESTCASE),)
+testcase:
+        @echo Specific Testcase execution not yet implemented!
+endif
+
 help:
         @$(CAT) help.txt
@@ -53 +59 @@
 listverbose:
         @php action.php listverbose
-        
+
 listexceptions:
         @echo Testcase exceptions

php/trunk/unittest/rdftestcases/rdftestcases.php

@@ -163 +163 @@
 
     // now list cases
-    echo "Categories of RDF Test Cases:\n";
     foreach ($categories as $category) {
       if ($verbose) {