[Genabel-commits] r1870 - pkg/OmicABELnoMM

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2014-10-28 17:32:47 +0100 (Tue, 28 Oct 2014)
New Revision: 1870

Modified:
   pkg/OmicABELnoMM/INSTALL
   pkg/OmicABELnoMM/test-driver
Log:
Some small changes to files generated by Autotools. Not sure how the changes came about. Usually only happens with a new version of Autotools...

However, nothing to worry about.


Modified: pkg/OmicABELnoMM/INSTALL
===================================================================
--- pkg/OmicABELnoMM/INSTALL	2014-10-28 15:59:18 UTC (rev 1869)
+++ pkg/OmicABELnoMM/INSTALL	2014-10-28 16:32:47 UTC (rev 1870)
@@ -12,8 +12,8 @@
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented

Modified: pkg/OmicABELnoMM/test-driver
===================================================================
--- pkg/OmicABELnoMM/test-driver	2014-10-28 15:59:18 UTC (rev 1869)
+++ pkg/OmicABELnoMM/test-driver	2014-10-28 16:32:47 UTC (rev 1870)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2012-06-27.10; # UTC
+scriptversion=2013-07-13.22; # UTC
 
 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
@@ -44,13 +44,12 @@
 Usage:
   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
               [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 END
 }
 
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
 test_name= # Used for reporting.
 log_file=  # Where to save the output of the test script.
 trs_file=  # Where to save the metadata of the test run.
@@ -69,10 +68,23 @@
   --enable-hard-errors) enable_hard_errors=$2; shift;;
   --) shift; break;;
   -*) usage_error "invalid option: '$1'";;
+   *) break;;
   esac
   shift
 done
 
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
 if test $color_tests = yes; then
   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
   red='' # Red.