From: Matthias Braun <matze@braunis.de>
Date: Mon, 2 Jun 2008 13:53:20 +0000 (+0000)
Subject: fix shouldfail part of testscript
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=6c1e6bd9a3aaffd37d7c820dedeea0b952cd97a1;p=cparser

fix shouldfail part of testscript

[r19933]
---

diff --git a/parsetest/do_tests.sh b/parsetest/do_tests.sh
index acd51f0..7aa705e 100755
--- a/parsetest/do_tests.sh
+++ b/parsetest/do_tests.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+CPARSER=../build/cparser
+
 rm -f messages.cparser messages.gcc
 for i in *.c shouldpass/*.c; do
 	echo -n "Compile $i..."
-	../build/cparser $i -O3 -o prog.cparser >> messages.cparser 2>&1 || echo -n " CPARSER COMPILE FAILED"
+	"$CPARSER" $i -O3 -o prog.cparser >> messages.cparser 2>&1 || echo -n " CPARSER COMPILE FAILED"
 	gcc -m32 -std=gnu99 $i -O3 -o prog.gcc >> messages.gcc 2>&1 || echo -n " GCC COMPILE FAILED"
 	./prog.cparser > out.cparser || echo -n " FAILED CPARSER RUN"
 	./prog.gcc > out.gcc || echo -n " FAILED GCC RUN"
@@ -13,14 +15,14 @@ done
 
 for i in MS/*.c; do
 	echo -n "Compile $i..."
-	../build/cparser --ms $i -O3 -o prog.cparser >> messages.cparser 2>&1 || echo -n " CPARSER COMPILE FAILED"
+	"$CPARSER" --ms $i -O3 -o prog.cparser >> messages.cparser 2>&1 || echo -n " CPARSER COMPILE FAILED"
 	./prog.cparser > out.cparser || echo -n " FAILED CPARSER RUN"
 	echo ""
 done
 
 for i in should_warn/*.c; do
 	echo -n "Compile $i..."
-	../cparser $i -Wall -O3 -o prog.cparser >> messages.cparser 2>&1 || echo -n " CPARSER DID NOT COMPILE"
+	"$CPARSER" $i -Wall -O3 -o prog.cparser >> messages.cparser 2>&1 || echo -n " CPARSER DID NOT COMPILE"
 	gcc -Wall -m32 -std=gnu99 $i -O3 -o prog.gcc >> messages.gcc 2>&1 || echo -n " GCC DID NOT COMPILER"
 	echo ""
 	if diff -u /dev/null messages.cparser > /dev/null; then
@@ -33,7 +35,7 @@ done
 
 for i in shouldfail/*.c; do
 	echo -n "Compile $i..."
-	../cparser $i -O3 -o prog.cparser >> messages.cparser 2>&1 && echo -n " CPARSER COMPILED"
+	"$CPARSER" $i -O3 -o prog.cparser >> messages.cparser 2>&1 && echo -n " CPARSER COMPILED"
 	gcc -m32 -std=gnu99 $i -O3 -o prog.gcc >> messages.gcc 2>&1 && echo -n " GCC COMPILED"
 	echo ""
 done
diff --git a/parsetest/shouldfail/kr2.c b/parsetest/shouldfail/kr2.c
index 828663b..b6ee75c 100644
--- a/parsetest/shouldfail/kr2.c
+++ b/parsetest/shouldfail/kr2.c
@@ -3,7 +3,7 @@ int a(first, second, third)
 	const char *third;
 	float first;
 {
-	printf("Args: %d %f %s\n", first, second, third);
+	printf("Args: %f %d %s\n", first, second, third);
 	return 0;
 }