Author: wyoung
Date: Mon Jan 11 22:45:59 2010
New Revision: 2619

URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2619&view=rev
Log:
Added ssqlsxlat -o stuff to dtest

Modified:
    trunk/Wishlist
    trunk/bmark.txt
    trunk/dtest

Modified: trunk/Wishlist
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/Wishlist?rev=2619&r1=2618&r2=2619&view=diff
==============================================================================
--- trunk/Wishlist (original)
+++ trunk/Wishlist Mon Jan 11 22:45:59 2010
@@ -40,24 +40,6 @@
     o Document sql_*_null in userman
 
     o SSQLS v2 (http://lists.mysql.com/plusplus/6929):
-
-      - In dtest, check that -o gives equivalent code to -i:
-
-            for f in examples/*.ssqls
-            do
-                ssqlsxlat -i %f -o /tmp/dtest-ssxgv2-pass1-$f > /dev/null
-                diff -q /tmp/dtest-ssxgv2-pass?-$f > /dev/null
-                error=$?
-                rm /tmp/dtest-ssxgv2-pass?-$f
-                die if $error
-            done
-
-               We depend on not redirecting stderr to catch differences due to
-               directives and line elements we ignore.  The two-pass structure
-               is necessary to deal with comments, whitespace differences, line
-               element ordering, boolean value and type canonicalization, and
-               other niggly differences we really don't care about.  diff -w
-               isn't enough.
 
       - C++ code generator, from walking DSL parse tree:
 

Modified: trunk/bmark.txt
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/bmark.txt?rev=2619&r1=2618&r2=2619&view=diff
==============================================================================
--- trunk/bmark.txt (original)
+++ trunk/bmark.txt Mon Jan 11 22:45:59 2010
@@ -247,3 +247,11 @@
 No image content!
 ================ END cgi_jpeg OUTPUT ================
 
+--- BEGIN ssqlsxlat -i test/test1.ssqls -o ERROR OUTPUT ---
+==== END ssqlsxlat -i test/test1.ssqls -o ERROR OUTPUT ====
+--- BEGIN ssqlsxlat -i test/test2.ssqls -o ERROR OUTPUT ---
+==== END ssqlsxlat -i test/test2.ssqls -o ERROR OUTPUT ====
+--- BEGIN ssqlsxlat -i examples/common.ssqls -o ERROR OUTPUT ---
+==== END ssqlsxlat -i examples/common.ssqls -o ERROR OUTPUT ====
+--- BEGIN ssqlsxlat -i examples/stock.ssqls -o ERROR OUTPUT ---
+==== END ssqlsxlat -i examples/stock.ssqls -o ERROR OUTPUT ====

Modified: trunk/dtest
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/dtest?rev=2619&r1=2618&r2=2619&view=diff
==============================================================================
--- trunk/dtest (original)
+++ trunk/dtest Mon Jan 11 22:45:59 2010
@@ -64,6 +64,27 @@
 done
 echo
 
+# Test ssqlsxlat -o.  Note that it suppresses stdout but keeps stderr
+# so warnings about directives and line elements it doesn't understand
+# aren't suppressed.  We run the first pass's output back through
+# ssqlsxlat to deal with comments, whitespace differences, line element
+# ordering, boolean value and type canonicalization, and other niggly
+# differences we really don't care about.  diff -w isn't enough.
+for f in {examples,test}/*.ssqls
+do
+       echo -n "Testing ssqlsxlat -i $f -o..."
+       echo "--- BEGIN ssqlsxlat -i $f -o ERROR OUTPUT ---" >> $TMP
+       pass1=/tmp/dtest-ssxgv2-pass1-$bnf
+       pass2=/tmp/dtest-ssxgv2-pass2-$bnf
+       echo -n "pass 1"
+       ./exrun ssqlsxlat -i $f -o $pass1 > /dev/null 2>> $TMP
+       echo -n ", pass 2"
+       ./exrun ssqlsxlat -i $pass1 -o $pass2 > /dev/null 2>> $TMP
+       echo -n ", diff"
+       diff $pass1 $pass2 > /dev/null >> $TMP
+       echo "==== END ssqlsxlat -i $f -o ERROR OUTPUT ====" >> $TMP
+       echo
+done
 
 # Check for any changes
 BFILE=bmark.txt


_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits

Reply via email to