cosmetics in regression test

git-svn-id: svn://svn.videolan.org/x264/trunk@626 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Makefile b/Makefile
index c00452803f043032a244158ed80b3902841ae49f..2b30f8beb9ae8df17cab5d8493259c781104f173 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ ifeq (,$(VIDS))
 fprofiled:
        @echo 'usage: make fprofiled VIDS="infile1 infile2 ..."'
        @echo 'where infiles are anything that x264 understands,'
-       @echo 'i.e. YUV with resolution in the filename, or avisynth.'
+       @echo 'i.e. YUV with resolution in the filename, y4m, or avisynth.'
 else
 fprofiled:
        $(MAKE) clean
@@ -168,9 +168,15 @@ TAGS:
 dox:
        doxygen Doxyfile
 
-# usage is same as for fprofiled
+ifeq (,$(VIDS))
+test:
+       @echo 'usage: make test VIDS="infile1 infile2 ..."'
+       @echo 'where infiles are anything that x264 understands,'
+       @echo 'i.e. YUV with resolution in the filename, y4m, or avisynth.'
+else
 test:
        perl tools/regression-test.pl --version=head,current --options='$(OPT0)' --options='$(OPT1)' --options='$(OPT2)' $(VIDS:%=--input=%)
+endif
 
 testclean:
        rm -f test/*.log test/*.264

diff --git a/tools/regression-test.pl b/tools/regression-test.pl
index 7c84b295940db193d37a3220b4843f88d791ee16..b9a4f14f62fdaf8b2e74363f1e908488cd187497 100644 (file)
--- a/tools/regression-test.pl
+++ b/tools/regression-test.pl
@@ -74,18 +74,16 @@ foreach my $version (@versions)
     print("building version: $version\n");
     if ($version eq "current")
     {
-        system("./configure > build.log");
-        system("make >> build.log 2>&1");
+        system("(./configure && make) &> test/build.log");
         mkpath("test/x264-$version");
         if (! -e "x264") { print("build failed \n"); exit 1; }
         copy("x264", "test/x264-$version/x264");
         chmod(0755, "test/x264-$version/x264");
         next;
     }
-    system("svn checkout -$version svn://svn.videolan.org/x264/trunk/ test/x264-$version");
+    system("svn checkout -$version svn://svn.videolan.org/x264/trunk/ test/x264-$version >/dev/null");
     chdir("test/x264-$version");
-    system("./configure > build.log");
-    system("make >> build.log 2>&1");
+    system("(./configure && make) &> build.log");
     chdir("../..");
     if (! -e "test/x264-$version/x264") { print("build failed \n"); exit 1; }
 }
@@ -183,7 +181,7 @@ sub compare_logs
     #    $is_diff = 1;
     #}
 
-    return  $is_diff;
+    return $is_diff;
 
     # TODO compare frame by frame PSNR/SSIM, record improved or unimproved ranges
     #parse_log_frame_stats($log1);
@@ -208,10 +206,10 @@ sub compare_raw264
     if ($rawdata1 ne $rawdata2)
     {
         print("compressed files differ \n");
-        return  1;
+        return 1;
     }
 
-    return  0;
+    return 0;
 }
 
 sub parse_log_frame_stats