Some bugs removed, Resolving weak types rewritten, no known bugs now.

3 files changed, 21 insertions, 13 deletions

diff --git a/conformance/dotest b/conformance/dotest
index 76b8cbb..f8bf62d 100755
--- a/conformance/dotest
+++ b/conformance/dotest
@@ -1,14 +1,16 @@
 #!/bin/sh
 # Generate and test a single test data.
 
+generator="test_gen_rand"
+
 path=`dirname $(which $0)`
 
 trap 'rm -f $path/test.{in,out,ref} &> /dev/null ; exit' INT
 
-if ! test -f "$path/test_gen_rand"; then
-  gcc -o $path/test_gen_rand $path/test_gen_rand.c
+if ! test -f "$path/$generator"; then
+  gcc -o $path/$generator $path/$generator.c
 fi
 
-$path/test_gen_rand $1 > $path/test.in
+$path/$generator $1 | sed 's|\\\\||g' > $path/test.in
 shift
 cat $path/test.in | $path/test -clean $@
diff --git a/conformance/reference/bidiref.cpp b/conformance/reference/bidiref.cpp
index 43d57ec..8791a0d 100644
--- a/conformance/reference/bidiref.cpp
+++ b/conformance/reference/bidiref.cpp
@@ -221,7 +221,7 @@ int NTypes[] = {
     LRO,    // LRO
     LRE,    // LRE
     PDF,    // PDF
-	ON,		// LS
+    ON,     // LS
 };
 
 int ClassFromChN(TCHAR ch)
diff --git a/conformance/test b/conformance/test
index 6a1d194..46fa08c 100755
--- a/conformance/test
+++ b/conformance/test
@@ -5,15 +5,20 @@
 
 path=`dirname $(which $0)`
 
-if ! test -f "$path/reference/bidiref"; then
-  gcc -o $path/reference/bidiref $path/reference/bidiref.cpp
-fi
-
 if ! test -f "$path/../fribidi"; then
   echo "You must make fribidi first."
   exit 1
 fi
 
+if ! test -f "$path/reference/bidiref"; then
+  if test -z "`echo -n | $path/../fribidi -debug 2>&1`"; then
+    debug="-DDEBUGGING"
+  else
+    debug=""
+  fi
+  gcc $debug -o $path/reference/bidiref $path/reference/bidiref.cpp
+fi
+
 convertsub () {
   refline="`echo \"$refline\" | sed s/$1/$2/g`"
 }
@@ -25,13 +30,16 @@ while [ -n "$1" ]; do
   elif test "$1" = "-clean"; then
     p1=$p1" -clean"
     p2=$p2" -clean"
+  else
+    par=$par" $1"
   fi
   shift
 done
 
-echo -n > $path/test.out
-echo -n > $path/test.ref
+ > $path/test.out
+ > $path/test.ref
 
+cat $par | 
 while read line; do
   echo "$line" | $path/../fribidi $p1 -nopad >> $path/test.out
 #  echo "$line" | $path/reference/bidiref $p2 >> $path/test.ref
@@ -50,6 +58,4 @@ while read line; do
   echo "$refline" >> $path/test.ref
 done
 
-#if test -z `diff $path/test.out $path/test.ref`; then
-#  rm -f $path/test.in $path/test.out $path/test.ref
-#fi
+diff $path/test.out $path/test.ref