more tests should ne able to coexist - re-enable testing of k{22,27}-f12

[infrastructure.git] / scripts / all-modules.sh

diff --git a/scripts/all-modules.sh b/scripts/all-modules.sh
index 792b4c5..6cbe17b 100755 (executable)
--- a/scripts/all-modules.sh
+++ b/scripts/all-modules.sh
@@ -18,7 +18,7 @@ function do_update() {
     if [ -f $build_dir/auto-update.sh ] ; then
        $build_dir/auto-update.sh
     else
-       pushd $build_dir; svn update > .update.log 2>&1 ; popd
+       ( cd $build_dir; svn update > .update.log 2>&1 )
     fi
 }
 
@@ -28,15 +28,11 @@ function do_version () {
     name=$1; shift
 
     out_dir=$OUTPUT/$name
-    out_file=$out_dir/version.txt
-    out_tmp=$out_dir/.version.txt
+    out_file=$out_dir/version.html
+    out_tmp=$out_dir/.version.html
     
     mkdir -p $out_dir
-    
-    ( echo $name ; \
-      date ; \
-      $build_dir/module-version -a --url ; \
-      date ) &> $out_tmp
+    $build_dir/module-version --www $name -a --url &> $out_tmp
     mv -f $out_tmp $out_file
 }
 
@@ -46,24 +42,12 @@ function do_diff () {
     name=$1; shift
 
     out_dir=$OUTPUT/$name
-    out_file=$out_dir/diff.txt
-    out_tmp=$out_dir/.diff.txt
+    out_file=$out_dir/diff.html
+    out_tmp=$out_dir/.diff.html
     
     mkdir -p $out_dir
-    
-### older syntax was messy    
-#    ( echo $name ; \
-#      date ; \
-#      $build_dir/module-diff -a -o ; \
-#      date ) &> $out_tmp
-#
-#    ( echo 'WARNINGS (if any)' ; \
-#      egrep 'was not found|Skipping failed' $out_tmp ;
-#      cat $out_tmp ) > $out_file
-
-    $build_dir/module-diff -a -W $name &> $out_tmp
-
-    rm -f $out_tmp
+    $build_dir/module-diff --www $name -a &> $out_tmp
+    mv -f $out_tmp $out_file
 
 }
 
@@ -87,12 +71,12 @@ function main () {
     
     echo $$ > $LOCK
 
+    do_update  /root/svn-build-4.3
+    do_diff    /root/svn-build-4.3 4.3
+    do_version /root/svn-build-4.3 4.3 
     do_update  /root/svn-build
     do_diff    /root/svn-build     trunk 
     do_version /root/svn-build     trunk 
-#    do_update  /root/svn-build-4.2
-#    do_diff    /root/svn-build-4.2 4.2 
-#    do_version /root/svn-build-4.2 4.2 
 
     rm $LOCK