Changed where we spawn mojoshader-compiler from, for __FILE__ testing.

icculus · Mar 3, 2010 · 020786b · 020786b
1 parent 51d7da2
commit 020786b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/unit_tests/run_tests.pl b/unit_tests/run_tests.pl
@@ -3,12 +3,14 @@
 use warnings;
 use strict;
 use Digest::SHA1;
+use Cwd;
 
 use FindBin qw($Bin);
 my $testdir = $Bin;
 undef $Bin;
 #print("testdir is $testdir\n");
-
+my $binpath = getcwd();
+#print("binpath is $binpath\n");
 
 my $GPrintCmds = 0;
 
@@ -58,7 +60,7 @@ sub compare_files {
 
     # !!! FIXME: this should go elsewhere.
     if ($module eq 'preprocessor') {
-        $cmd = "./mojoshader-compiler -P '$fname' -o '$output'";
+        $cmd = "$binpath/mojoshader-compiler -P '$fname' -o '$output'";
     } else {
         return (0, "Don't know how to do this module type");
     }
@@ -88,12 +90,13 @@ sub compare_files {
 my $skip = 0;
 
 my $result = '';
+chdir($testdir) or die("Failed to chdir('$testdir'): $!\n");
 foreach (@modules) {
     my $module = $_;
     foreach (keys %tests) {
         my $testtype = $_;
         my $fn = $tests{$_};
-        my $d = "$testdir/$module/$testtype";
+        my $d = "$module/$testtype";
         next if (not -d $d);  # no tests at the moment.
         opendir(TESTDIR, $d) || die("Failed to open dir '$d': $!\n");
         print(" ... $module / $testtype ...\n");