diff options
Diffstat (limited to 'runtest.pl.in')
| -rwxr-xr-x | runtest.pl.in | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/runtest.pl.in b/runtest.pl.in index 27b94763..b4f59c1f 100755 --- a/runtest.pl.in +++ b/runtest.pl.in @@ -99,11 +99,7 @@ sub runtest # attempt to make this test my $flag = ($test_mode eq 'release')?(BoxPlatform::make_flag('RELEASE')):''; -<<<<<<< HEAD - my $make_res = system("cd test/$t ; $make_command $flag"); -======= my $make_res = system("cd test/$t && $make_command $flag"); ->>>>>>> 0.12 if($make_res != 0) { push @results,"$t: make failed"; |