Changeset 8318

Timestamp:

21/12/11 11:17:43 (5 months ago)

Author:

westram

Message:

• repaired compile-tests for delivered perl-macros and -scripts
  • was broken by [6318]
  • now tests whether Lint/LintSubs is installed
    • if not installed -> accept failure
    • if installed -> fail compilation if scripts do not compile
  • test whether Bioperl is installed
    • if not installed -> accept failure on scripts in BIOPERL folder
    • if installed -> fail compilation if scripts there do not compile

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• PERL_SCRIPTS/test/Makefile (modified) (1 diff)
• PERL_SCRIPTS/test/check_arb.pl (added)
• PERL_SCRIPTS/test/check_bioperl.pl (added)
• PERL_SCRIPTS/test/check_lint.pl (added)
• PERL_SCRIPTS/test/testScripts.pl (modified) (2 diffs)

trunk/Makefile

@@ -1576 +1576 @@
                         "cross_lflags=$(cross_lflags)" \
                         all && \
+                $(MAKE) -C PERL_SCRIPTS/test test && \
                 echo "$(SEP) Make PERL2ARB [done]" ; \
         ) > PERL2ARB.log 2>&1 && (cat PERL2ARB.log;rm PERL2ARB.log)) || (cat PERL2ARB.log;rm PERL2ARB.log;false)
-
-
-testperlscripts: perl 
-        @$(MAKE) -C PERL_SCRIPTS/test test
 
 perl_clean:

trunk/PERL_SCRIPTS/test/Makefile

@@ -19 +19 @@
         @echo $(SEP) Testing scripts in PERL_SCRIPTS
         @perl -c testScripts.pl
-        @perl testScripts.pl || echo "You either lack S::LintSubs and/or Bio::TreeIO or the perl scripts are buggy. We continue anyway.."
+        @perl testScripts.pl
         @touch $@
 

trunk/PERL_SCRIPTS/test/testScripts.pl

@@ -99 +99 @@
 }
 
+my %failed_test = (); # scripts in this directory (key=failed script,value=1)
+my $failed_bioperl = 0; # script in BIOPERL directory
+my $failed_normal  = 0; # other scripts
+
+sub announce_failure($) {
+  my ($script) = @_;
+  if ($script =~ /\/PERL_SCRIPTS\/test\//) {
+    $failed_test{$'} = 1;
+  }
+  elsif ($script =~ /\/PERL_SCRIPTS\/BIOPERL\//) { $failed_bioperl++; }
+  else { $failed_normal++; }
+}
+
 sub main() {
   $arbhome = $ENV{ARBHOME};
@@ -116 +129 @@
   # foreach (@scripts) { print "- '$_'\n"; }
 
-  my $failed = 0;
-  foreach (@modules) { if (test_script($_,1)==0) { $failed++; } }
-  foreach (@scripts) { if (test_script($_,0)==0) { $failed++; } }
+  foreach (@modules) { if (test_script($_,1)==0) { announce_failure($_); } }
+  foreach (@scripts) { if (test_script($_,0)==0) { announce_failure($_); } }
 
-  if ($failed>0) {
-    die "$failed perl scripts failed to compile\n";
+  $| = 1;
+
+  if (defined $failed_test{'check_lint.pl'}) {
+    print "Assuming Lint/LintSubs is not installed (cannot test whether perl modules compile)\n";
+  }
+  else {
+    my $failed = $failed_normal+$failed_bioperl;
+
+    if (defined $failed_test{'check_arb.pl'}) {
+      die "Fatal error: Failed to load ARB perl module\n";
+    }
+    if (defined $failed_test{'check_bioperl.pl'}) {
+      print "Assuming BIOPERL is not installed\n";
+      if ($failed_bioperl==0) {
+        die "but all BIOPERL scripts compiled - sth is completely wrong here\n";
+      }
+      print "accepting $failed_bioperl failing scripts that use BIOPERL\n";
+      $failed -= $failed_bioperl;
+    }
+    else {
+      print "Assuming BIOPERL is installed\n";
+    }
+
+    if ($failed>0) {
+      die "$failed scripts failed to compile\n";
+    }
   }
 }