re PR treelang/23072 (multiple runs of treelang testsuite does not work...)

2005-08-06  James A. Morrison  <phython@gcc.gnu.org>

        PR treelang/23072
        * Make-lang.in: Remove old testing cruft.

From-SVN: r102813

gcc/testsuite/treelang/ChangeLog

-2005-07-23  James A. Morrrison  <phython@gcc.gnu.org>
+2005-08-06  James A. Morrison  <phython@gcc.gnu.org>
+
+	* treetests.exp: Remove.
+	* a01gcco01runpgm: Move to...
+	* output/output-1.out: here.
+	* a01gcci01.c: Move to...
+	* output/output-1.c: here.
+	* a01gcci01.tree: Move to...
+	* output/output-1.tree: here.
+	* output/output.exp: New.
+
+2005-07-23  James A. Morrison  <phython@gcc.gnu.org>
 
 	* compile/var_defs.tree: Remove extra lines.
 
-2005-07-19  James A. Morrrison  <phython@gcc.gnu.org>
+2005-07-19  James A. Morrison  <phython@gcc.gnu.org>
 
 	* compile/var_defs.tree: Remove duplicate variable.
 	* compile/var_defs-2.tree: Add duplicate variable test.

gcc/testsuite/treelang/output/output.exp

+proc test_treelang_output { testname srcfiles infile resfile args } {
+    set comp_output [treelang_target_compile $srcfiles $testname executable $args]
+    if { [treelang_check_compile $testname $args $testname $comp_output] == 0 } {
+    	return 0;
+    }
+
+    verbose "Expected output is in $resfile"
+    set id [open $resfile r]
+    set expected ""
+    append expected [read $id]
+    close $id
+    set output ""
+    set output [exec $testname $infile]
+    regsub -all "\r" "$output" "" output
+    regsub "\n*$" $expected "" expected
+    regsub "\n*$" $output "" output
+    regsub "^\n*" $expected "" expected
+    regsub "^\n*" $output "" output
+    regsub -all "\[ \t\]\[ \t\]*" $expected " " expected
+    regsub -all "\[ \t\]*\n\n*" $expected "\n" expected
+    regsub -all "\[ \t\]\[ \t\]*" $output " " output
+    regsub -all "\[ \t\]*\n\n*" $output "\n" output
+    verbose "expected is $expected"
+    verbose "actual is $output"
+
+    if { $expected == $output } {
+	pass $testname
+    } else {
+        fail $testname
+    }
+    exec rm $testname
+}
+global srcdir subdir
+
+catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.out] } outfiles
+verbose "Output files are $outfiles"
+
+set prefix ""
+foreach x $outfiles {
+    regsub "\\.out$" $x "" prefix
+    set bname [file tail $prefix]
+
+    if [file exists ${prefix}.inp] {
+	set inpfile ${prefix}.inp
+    } else {
+	set inpfile ""
+    }
+
+    verbose "inpfile is $inpfile"
+
+    set srcfiles [lsort [glob -nocomplain ${prefix}.{c,tree}]]
+    verbose "source files are $srcfiles"
+    test_treelang_output "treelang/$bname" $srcfiles $inpfile $x ""
+}
+
+# Local Variables:
+# tcl-indent-level:4
+# End:

gcc/treelang/ChangeLog

+2005-08-06  James A. Morrison  <phython@gcc.gnu.org>
+
+	PR treelang/23072
+	* Make-lang.in: Remove old testing cruft.
+
 2005-06-25  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* all files: Update FSF address in copyright headers.

gcc/treelang/Make-lang.in

@@ -295,7 +295,6 @@ treelang.check: $(TESTSUITEDIR)/site.exp
 # these three files are empty and it seems diff has trouble generating
 # patch files for new empty files as required for cvs.
 # STAMP does not cut it here as I need an empty file.
-	touch $(srcdir)/testsuite/treelang/{a01gcco01runpgmerr,a01gcc.out01,a01gcc.out01err}
 	-rootme=`${PWD_COMMAND}`; export rootme; \
 	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
 	cd testsuite; \
@@ -307,7 +306,6 @@ treelang.check: $(TESTSUITEDIR)/site.exp
 	PATH=`cd ..;${PWD_COMMAND}`:$$PATH; export PATH; \
 	gcc_extras="-B`cd ..;${PWD_COMMAND}` -B`cd ..;${PWD_COMMAND}`/treelang"; export gcc_extras; \
 	$(RUNTEST) --tool treelang $(RUNTESTFLAGS)
-	rm $(srcdir)/testsuite/treelang/{a01gcco01runpgmerr,a01gcc.out01,a01gcc.out01err}
 
 # copy the output files from the current test to source ie say the new results are OK
 treelang.check.fix: force