Author: raja
Date: 2005-03-16 06:00:20 -0500 (Wed, 16 Mar 2005)
New Revision: 41884
Removed:
trunk/mcs/errors/runtest.pl
Modified:
trunk/mcs/errors/ChangeLog
trunk/mcs/errors/Makefile
Log:
* Makefile (RUNTEST_PL, test-multi-local): Remove, now that
they're no longer used.
* runtest.pl: Remove.
Modified: trunk/mcs/errors/ChangeLog
===================================================================
--- trunk/mcs/errors/ChangeLog 2005-03-16 10:54:43 UTC (rev 41883)
+++ trunk/mcs/errors/ChangeLog 2005-03-16 11:00:20 UTC (rev 41884)
@@ -1,3 +1,9 @@
+2005-03-16 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * Makefile (RUNTEST_PL, test-multi-local): Remove, now that
+ they're no longer used.
+ * runtest.pl: Remove.
+
2005-03-13 Martin Baulig <[EMAIL PROTECTED]>
Reverted things back to revision 41701, which was the last one
Modified: trunk/mcs/errors/Makefile
===================================================================
--- trunk/mcs/errors/Makefile 2005-03-16 10:54:43 UTC (rev 41883)
+++ trunk/mcs/errors/Makefile 2005-03-16 11:00:20 UTC (rev 41884)
@@ -11,13 +11,10 @@
GENERICS_COMPILE = $(CSCOMPILE) /target:library
-RUNTEST_PL = ./runtest.pl
-
DISTFILES = \
CONTRIBUTORS_README \
README.tests \
errors.txt \
- runtest.pl \
do-tests.pl \
$(wildcard *.cs) \
$(wildcard *.inc) \
@@ -27,7 +24,6 @@
gmcs-expect-no-error gmcs-expect-wrong-error gmcs-ignore-tests \
generics-expect-no-error generics-expect-wrong-error
-#all-local: run-test-local test-multi-local
all-local: CS0118-2-lib.dll CS0122-10-lib.dll CS0534-3-lib.dll
CS0534-4-lib.dll CS0571-3-lib.dll \
CS0612-2-lib.dll CS0618-2-lib.dll CS0619-8-lib.dll CS0619-17-lib.dll
CS0619-32-lib.dll CS0619-33-lib.dll CS0619-36-lib.dll \
CS3005-16-lib.dll CS3013-module.dll
@@ -60,30 +56,6 @@
-rm -f generics.log
@./do-tests.pl generics '$(GENERICS_COMPILE)' "gcs*.cs"
-test-multi-local:
- @ failed=false; \
- testsuite_log=test-multi.log; rm -f $$testsuite_log ; \
- for i in error-*.cs; do \
- test_out=`echo $$i | sed 's,.cs$$,.out,'` ; \
- test_log=`echo $$i | sed 's,.cs$$,.log,'` ; \
- echo -n "Running test $$i ... "; \
- $(CSCOMPILE) $$i > $$test_out 2>&1 || : ; \
- if $(RUNTEST_PL) $$i $$test_out > $$test_log 2>&1 ; \
- then echo OK; rm -f $$test_out $$test_log ; \
- echo "PASS: $$i" >> $$testsuite_log ; \
- else echo FAILED; \
- echo "FAIL: $$i" >> $$testsuite_log ; \
- flist="$$flist $$i"; \
- failed=true; \
- fi; \
- done; \
- if $$failed; then \
- echo "The following tests failed: $$flist"; \
- exit 1; \
- else \
- echo All tests passed; \
- fi
-
clean-local:
rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk
Deleted: trunk/mcs/errors/runtest.pl
===================================================================
--- trunk/mcs/errors/runtest.pl 2005-03-16 10:54:43 UTC (rev 41883)
+++ trunk/mcs/errors/runtest.pl 2005-03-16 11:00:20 UTC (rev 41884)
@@ -1,102 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use IPC::Open3;
-
-sub remove ($$) {
- my ($val, $arr) = @_;
- my $had = 0;
- my @hasnt = ();
-
- for my $v (@$arr) {
- if ($v == $val) { $had = 1; }
- else { push @hasnt, $v; }
- }
- return ($had, [EMAIL PROTECTED]);
-}
-
-# Setting $strict to 1 enables line number checks, setting it to 2 makes
-# line number mismatches fatal.
-my $strict = 2;
-my $failures = 0;
-
-if ($#ARGV != 1) {
- print STDERR "Usage: $0 testcase.cs testcase.out\n";
- exit 1;
-}
-
-my %errors = ();
-my %warnings = ();
-my %lines = ();
-
-my $csfile = $ARGV [0];
-my $mcsout = $ARGV [1];
-my $input;
-
-my $line = 0;
-
-open (INPUT, "<$csfile") or die
- "Can't open testcase: $!";
-while (defined ($input = <INPUT>)) {
- ++$line;
- chop $input;
- next unless $input =~ m,^\s*//\s*(error|warning)?\s*(CS\d+),;
-
- if ((defined $1) and ($1 eq 'warning')) {
- push @{$warnings{$2}}, $line+1;
- } else {
- push @{$errors{$2}}, $line+1;
- }
-
- $lines{$line+1} = $2;
-}
-
-close INPUT;
-
-open (MCS, "$mcsout") or die
- "Can't open compiler output file: $!";
-
-while (defined ($input = <MCS>)) {
- chop $input;
- next unless $input =~ m,\((\d+)\)\s+(warning|error)\s+(CS\d+):,;
- my $had;
-
- if (!defined $lines{$1}) {
- print "Unexpected $2 $3 on line $1.\n";
- $failures++ if $strict == 2;
- next;
- }
-
- if ($2 eq 'warning') {
- ($had, $warnings{$3}) = remove $1, $warnings{$3};
- if ($strict && ! $had) {
- print "Didn't expect any warnings on line $1, but got $2 $3.\n";
- $failures++ if $strict == 2;
- }
- } else {
- ($had, $errors{$3}) = remove $1, $errors{$3};
- if ($strict && ! $had) {
- print "Didn't expect any errors on line $1, but got $2 $3.\n";
- $failures++ if $strict == 2;
- }
- }
-
- print "Expected to find ".$lines{$1}." on line $1, but got $3.\n"
- if $strict and $lines{$1} ne $3;
-}
-
-close MCS;
-
-foreach my $error (keys %errors) {
- print "Failed to report error $error on line $_\n"
- for @{$errors{$error}};
- $failures += @{$errors{$error}};
-}
-
-foreach my $warning (keys %warnings) {
- print "Failed to report warning $warning on line $_\n"
- for @{$warnings{$warning}};
- $failures += @{$warnings{$warning}};
-}
-
-exit ($failures != 0);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
