From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Fri, 25 Jan 2002 18:21:42 +0000 (+0000)
Subject: Fix winsystem.t's attempt to build showav.exe to work
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9e735501884a3429d67c8ca73d8bc17bf1b673f0;p=p5sagit%2Fp5-mst-13.2.git

Fix winsystem.t's attempt to build showav.exe to work
with gcc (which writes a.exe unless told with -o ).
Also put in a few more fail-safes to check .exe got
built somehow.

p4raw-id: //depot/perlio@14420
---

diff --git a/t/op/winsystem.t b/t/op/winsystem.t
index 22dcd8b..a0266da 100644
--- a/t/op/winsystem.t
+++ b/t/op/winsystem.t
@@ -26,6 +26,7 @@ my $exename = "showav";
 my $plxname = "showargv";
 rmtree($testdir);
 mkdir($testdir);
+die "Could not create '$testdir':$!" unless -d $testdir;
 
 open(my $F, ">$testdir/$exename.c")
     or die "Can't create $testdir/$exename.c: $!";
@@ -75,8 +76,8 @@ close $F;
 # build the executable
 chdir($testdir);
 END {
-    chdir($cwd);
-    rmtree($testdir);
+#    chdir($cwd);
+#    rmtree($testdir);
 }
 if (open(my $EIN, "$cwd/op/${exename}_exe.uu")) {
     print "# Unpacking $exename.exe\n";
@@ -92,15 +93,37 @@ if (open(my $EIN, "$cwd/op/${exename}_exe.uu")) {
     close $EOUT;
 }
 else {
-    print "# Compiling $exename.c\n";
-    if (system("$Config{cc} $Config{ccflags} $exename.c 2>&1 >nul") != 0) {
+    my $minus_o = '';
+    if ($Config{cc} eq 'gcc')
+     {
+      $minus_o = "-o $exename.exe";
+     }
+    print "# Compiling $exename.c\n# $Config{cc} $Config{ccflags} $exename.c\n";
+    if (system("$Config{cc} $Config{ccflags} $minus_o $exename.c >log 2>&1") != 0) {
 	print "# Could not compile $exename.c, status $?\n"
 	     ."# Where is your C compiler?\n"
 	     ."1..0 # skipped: can't build test executable\n";
+	exit(0);
+    }
+    unless (-f "$exename.exe") {
+	if (open(LOG,'<log'))
+         {
+          while(<LOG>) {
+	     print "# ",$_;
+          } 
+         }
+        else {
+	  warn "Cannot open log (in $testdir):$!";
+        }
     }
 }
 copy("$plxname.bat","$plxname.cmd");
 chdir($cwd);
+unless (-x "$testdir/$exename.exe") {
+    print "# Could not build $exename.exe\n"
+	 ."1..0 # skipped: can't build test executable\n";
+    exit(0);
+}
 
 open my $T, "$^X -I../lib -w op/system_tests |"
     or die "Can't spawn op/system_tests: $!";