Browse Source

tuning build.sh to handle -DLTC_EASY

Karel Miko 8 years ago
parent
commit
be9c66ab43
2 changed files with 17 additions and 3 deletions
  1. 16 1
      build.sh
  2. 1 2
      check-source.pl

+ 16 - 1
build.sh

@@ -3,6 +3,11 @@ echo "$1 ($2, $3)..."
 
 make clean 1>/dev/null 2>/dev/null
 
+if [ -f check-source.pl ] ; then
+  echo "checking white spaces..."
+  perl check-source.pl || exit 1
+fi
+
 echo -n "building..."
 
 if [ -f /proc/cpuinfo ]
@@ -28,7 +33,17 @@ echo -n "testing..."
 if [ -a test ] && [ -f test ] && [ -x test ]; then
    ((./test >test_std.txt 2>test_err.txt && ./tv_gen > tv.txt) && echo "$1 test passed." && echo "y" > testok.txt) || (echo "$1 test failed, look at test_err.txt" && exit 1)
    if find *_tv.txt -type f 1>/dev/null 2>/dev/null ; then
-      for f in *_tv.txt; do if (diff -i -w -B $f notes/$f) then true; else (echo "tv_gen $f failed" && rm -f testok.txt && exit 1); fi; done
+      for f in *_tv.txt; do
+         # check for lines starting with '<' ($f might be a subset of notes/$f)
+         difftroubles=$(diff -i -w -B $f notes/$f | grep '^<')
+         if [ -n "$difftroubles" ]; then
+            echo "FAILURE: $f"
+            diff -i -w -B $f notes/$f
+            echo "tv_gen $f failed" && rm -f testok.txt && exit 1
+         else
+            true
+         fi
+      done
    fi
 fi
 

+ 1 - 2
check-source.pl

@@ -9,7 +9,6 @@
 use strict;
 use warnings;
 
-use Test::More;
 use File::Find 'find';
 use File::Basename 'basename';
 use File::Glob 'bsd_glob';
@@ -37,7 +36,7 @@ for my $file (sort @all_files) {
     $lineno++;
   }
   for my $k (sort keys %$troubles) {
-    warn "FAIL: [$k] $file line:" . join(",", @{$troubles->{$k}}) . "\n";
+    warn "[$k] $file line:" . join(",", @{$troubles->{$k}}) . "\n";
     $fails++;
   }
 }