added XML test set

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@221 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Aug 27, 2008 · 74ac07e · 74ac07e
1 parent e609721
commit 74ac07e
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 11 deletions.
diff --git a/shared/tools/buildtestsetxml b/shared/tools/buildtestsetxml
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Get our hands on basedir
+LOCAL1=${PWD}
+cd `dirname $0`
+cd ../..
+SLPS=${PWD}
+cd ${LOCAL1}
+
+if [ $# -ne 1 ]; then
+    echo "This script builds an XML test set for FL"
+    echo "Usage: $0 <output-directory>"
+    exit 1
+elif [ ! -r $1 ]; then
+    echo "Oops: $1 not found or not readable."
+    exit 1
+fi
+
+cp ${SLPS}/topics/fl/shared/factorial.xml $1/factorial.src
+cp ${SLPS}/topics/fl/shared/fac5.xml $1/factorial.run
+echo 120 > $1/factorial.val
+
diff --git a/shared/tools/ldf2set b/shared/tools/ldf2set
@@ -15,5 +15,5 @@ elif [ ! -r $1 ]; then
     echo "Oops: $1 not found or not readable."
     exit 1
 else
-    python ${SLPS}/topics/extraction/ldf2set/xml2set.py $1 $2
+    python ${SLPS}/topics/extraction/ldf2set/ldf2set.py $1 $2
 fi
diff --git a/topics/fl/lci/Makefile b/topics/fl/lci/Makefile
@@ -13,7 +13,7 @@ check:
 
 clean:
 	rm -f *~
-	rm -f codesamples/* bgf/*
+	rm -f codesamples/* xmlsamples/* bgf/*
 	rm -rf bin obj
 	rm -f *.user *.suo
 	rm -f architecture*

diff --git a/topics/fl/lci/fl.lcf b/topics/fl/lci/fl.lcf
@@ -32,19 +32,26 @@
     </command>
   </tool>
 
+  <tool>
+    <name>transformation</name>
+    <command>
+      <expand>tools</expand>/xbgf
+    </command>
+  </tool>
+
   <testset>
-    <name>codesamples</name>
+    <name>xmlsamples</name>
     <command>
-      <expand>tools</expand>/ldf2set <expand>fl</expand>/ldf/fl.ldf
+      <expand>tools</expand>/buildtestsetxml
     </command>
   </testset>
 
-  <tool>
-    <name>transformation</name>
+  <testset>
+    <name>codesamples</name>
     <command>
-      <expand>tools</expand>/xbgf
+      <expand>tools</expand>/ldf2set <expand>fl</expand>/ldf/fl.ldf
     </command>
-  </tool>
+  </testset>
 
   <source>
     <name>antlr</name>
@@ -102,13 +109,19 @@
   </source>
 
   <source>
-    <name>xsd</name>
+    <name>xml</name>
     <extraction>
       <expand>tools</expand>/xsd2bgf <expand>fl</expand>/xsd/fl.xsd
     </extraction>
     <parsing>
       <expand>tools</expand>/runxsdparser
     </parsing>
+    <evaluation>
+      <expand>tools</expand>/runxqueryevaluator
+    </evaluation>
+    <testing>
+      <set>xmlsamples</set>
+    </testing>
   </source>
 
   <source>
@@ -148,7 +161,7 @@
       <perform>unerase</perform>
     </branch>
     <branch>
-      <input>xsd</input>
+      <input>xml</input>
       <perform>trimXsd</perform>
       <perform>downcase</perform>
       <perform>massageXsd</perform>
@@ -193,4 +206,4 @@
     </branch>
   </target>
 
-</lcf:configuration>
+</lcf:configuration>