Merge branch '1.2'

.gitignore

@@ -23,9 +23,5 @@ Makefile
 tclap.pc
 config/test-driver
 tests/tmp.out
-tests/*.trs
+tests/test*.log
-tests/*.log
+tests/test*.trs
-
-
-
-

config/ac_cxx_warn_effective_cxx.m4

@@ -10,19 +10,19 @@ AC_DEFUN([HAVE_WARN_EFFECTIVE_CXX],
 [
 AC_REQUIRE([AC_PROG_CXX])
 AC_MSG_CHECKING([whether the C++ compiler (${CXX}) accepts -Weffc++])
-AC_CACHE_VAL([cv_warn_effective_cxx],
+AC_CACHE_VAL([_cv_warn_effective_cxx],
 [
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 save_cxxflags="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS -Weffc++"
 AC_TRY_COMPILE([],[main();],
-[cv_warn_effective_cxx=yes], [cv_warn_effective_cxx=no])
+[_cv_warn_effective_cxx=yes], [_cv_warn_effective_cxx=no])
 CXXFLAGS="$save_cxxflags"
 AC_LANG_RESTORE
 ])
-AC_MSG_RESULT([$cv_warn_effective_cxx])
+AC_MSG_RESULT([$_cv_warn_effective_cxx])
-if test "$cv_warn_effective_cxx" = yes; then
+if test "$_cv_warn_effective_cxx" = yes; then
 	WARN_EFFECTIVE_CXX=-Weffc++
 	WARN_NO_EFFECTIVE_CXX=-Wno-effc++
 fi

docs/index.html

@@ -79,8 +79,8 @@ Please don't let any apparent project inactivity discourage you
 from using the software!
 </p>
 <p>
-Don't hesitate to 
+Don't hesitate to <a href="https://sourceforge.net/p/tclap/_list/tickets">
-<a href="mailto:mes5k@users.sourceforge.net"> send us your feedback</a>!
+send us your feedback</a>!
 </p>
 
 <p>

docs/upload.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rsync -aP html index.html manual.html style.css \
+      $USER@web.sourceforge.net:/home/project-web/tclap/htdocs

examples/test1.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <string>
 #include <iostream>
 #include <algorithm>

examples/test10.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 // Test only makes sure we can use different argv types for the
 // parser. Don't run, just compile.
 

examples/test11.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include "tclap/CmdLine.h"
 #include <iterator>
 

examples/test12.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include "tclap/CmdLine.h"
 #include <iterator>
 #include <algorithm>

examples/test13.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <iostream>
 #include <string>
 

examples/test14.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include "tclap/CmdLine.h"
 #include <iterator>
 #include <algorithm>

examples/test15.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include "tclap/CmdLine.h"
 #include <iterator>
 #include <algorithm>

examples/test16.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include "tclap/CmdLine.h"
 #include <iterator>
 #include <algorithm>

examples/test17-a.cpp

@@ -1 +1,3 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <tclap/CmdLine.h>

examples/test17.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <tclap/CmdLine.h>
 
 int main() { }

examples/test18.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <string>
 #include <iostream>
 #include <algorithm>

examples/test19.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 
 #define TCLAP_SETBASE_ZERO 1

examples/test2.cpp

@@ -1,4 +1,4 @@
-
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
 
 #include "tclap/CmdLine.h"
 #include <iostream>

examples/test20.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <string>
 #include <iostream>
 #include <algorithm>

examples/test21.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 // This illustrates how to change the flag and name start strings.
 // Note that these defines need to happen *before* tclap is included!

examples/test3.cpp

@@ -1,4 +1,4 @@
-
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
 
 #include "tclap/CmdLine.h"
 #include <iostream>

examples/test4.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 
 #include "tclap/CmdLine.h"

examples/test5.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 
 #include "tclap/CmdLine.h"

examples/test6.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <string>
 #include "tclap/CmdLine.h"
 

examples/test7.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <string>
 #include "tclap/CmdLine.h"
 

examples/test8.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 
 #include "tclap/CmdLine.h"

examples/test9.cpp

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 #include <string>
 #include <iostream>
 #include <algorithm>

include/tclap/CmdLineInterface.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /****************************************************************************** 
  * 

include/tclap/CmdLineOutput.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 
 /****************************************************************************** 

include/tclap/Constraint.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /******************************************************************************
  *

include/tclap/HelpVisitor.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /****************************************************************************** 
  * 

include/tclap/IgnoreRestVisitor.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /****************************************************************************** 
  * 

include/tclap/MultiArg.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 /****************************************************************************** 
  * 
  *  file:  MultiArg.h

include/tclap/MultiSwitchArg.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /****************************************************************************** 
 *

include/tclap/OptionalUnlabeledTracker.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 
 /****************************************************************************** 

include/tclap/SwitchArg.h

@@ -1,4 +1,6 @@
-/******************************************************************************
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
+/****************************************************************************** 
  * 
  *  file:  SwitchArg.h
  * 

include/tclap/UnlabeledMultiArg.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /****************************************************************************** 
  * 

include/tclap/UnlabeledValueArg.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /****************************************************************************** 
  * 

include/tclap/ValueArg.h

@@ -1,4 +1,6 @@
-/******************************************************************************
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
+/****************************************************************************** 
  * 
  *  file:  ValueArg.h
  * 

include/tclap/ValuesConstraint.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 
 /****************************************************************************** 

include/tclap/Visitor.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /****************************************************************************** 
  * 

include/tclap/XorHandler.h

@@ -1,3 +1,5 @@
+// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-
+
 
 /****************************************************************************** 
  * 

scripts/fix-test.py

@@ -0,0 +1,63 @@
+#!/usr/bin/python
+
+# Copyright (c) 2018 Google LLC
+# All rights reserved.
+#
+# See the file COPYING in the top directory of this distribution for
+# more information.
+#
+# THE SOFTWARE IS PROVIDED _AS IS_, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+import sys
+import re
+
+def process_file(path):
+    args = None
+    out = None
+    test = None
+
+    lines = []
+
+    with open(path) as f:
+        for line in f.readlines():
+            if line.startswith('#'):
+                lines.append(line)
+                continue
+
+            m = re.match(r'../examples/(test[0-9]+) (.*) > tmp.out.*', line)
+            if m:
+                (test, args) = m.groups()
+                lines.append("./simple-test.sh `basename $0 .sh` %s %s\n"
+                             % (test, args))
+                continue
+
+            m = re.match(r'../examples/(test[0-9]+) > tmp.out.*', line)
+            if m:
+                test = m.group(1)
+                args = ""
+                lines.append("./simple-test.sh `basename $0 .sh` %s\n"
+                             % test)
+
+                continue
+
+            m = re.match(r'.*(test[0-9]+).out.*', line)
+            if m:
+                out = m.group(1)
+
+    if not all([v != None for v in [out, test, args]]):
+        print "Failed to parse", path
+        print out, test, args
+        return
+
+    with open(path, 'w') as f:
+        for line in lines:
+            f.write(line)
+
+for path in sys.argv[1:]:
+    process_file(path)

scripts/modeline.py

@@ -0,0 +1,16 @@
+import sys
+
+modline = "// -*- Mode: c++; c-basic-offset: 4; tab-width: 4; -*-\n\n"
+
+for path in sys.argv[1:]:
+    lines = [modline]
+    with file(path) as f:
+        lines += f.readlines()
+
+    has_modeline = any([l for l in lines[1:] if l.find('Mode: c++') != -1])
+    if has_modeline:
+        continue
+
+    with file(path, 'w') as f:
+        for line in lines:
+            f.write(line)

tests/simple-test.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ -z "$srcdir" ]; then
+    srcdir=`dirname $0`
+fi
+
+TEST_RESULT=$srcdir/$1
+shift
+
+../examples/"$@" 2>&1 | tee tmp.out
+
+if cmp -s tmp.out $TEST_RESULT.out; then
+    echo "OK"
+    exit 0
+else
+    echo "FAIL"
+    diff tmp.out $TEST_RESULT.out
+    exit 1
+fi

tests/test1.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
 
-# success
+./simple-test.sh test1 `basename $0 .sh` -r -n mike
-../examples/test1 -r -n mike > tmp.out 2>&1
-
-if cmp -s tmp.out $srcdir/test1.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test10.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test2 -i 10 -s hello > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 10 -s hello
-
-if cmp -s tmp.out $srcdir/test10.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test11.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test2 -i 10 -s hello -i 9 > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 10 -s hello -i 9
-
-if cmp -s tmp.out $srcdir/test11.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test12.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test2 -i 10 -s hello -f nine > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 10 -s hello -f nine
-
-if cmp -s tmp.out $srcdir/test12.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test13.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test3 --stringTest=bill -i=9 -i=8 -B homer marge bart > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3 --stringTest=bill -i=9 -i=8 -B homer marge bart
-
-if cmp -s tmp.out $srcdir/test13.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test14.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test3  --stringTest=aaa homer marge bart -- one two > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3  --stringTest=aaa homer marge bart -- one two
-
-if cmp -s tmp.out $srcdir/test14.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test15.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test3  --stringTest bbb homer marge bart -- -hv two > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3  --stringTest bbb homer marge bart -- -hv two
-
-if cmp -s tmp.out $srcdir/test15.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test16.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test3  --stringTest one homer -B -Bh > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3  --stringTest one homer -B -Bh
-
-if cmp -s tmp.out $srcdir/test16.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test17.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test3  --stringTest=one homer -B > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3  --stringTest=one homer -B
-
-if cmp -s tmp.out $srcdir/test17.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test18.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test4 -Bs --Bs asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test4 -Bs --Bs asdf
-
-if cmp -s tmp.out $srcdir/test18.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test19.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test4 -BA --Bs asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test4 -BA --Bs asdf
-
-if cmp -s tmp.out $srcdir/test19.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test2.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test1 -n mike > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test1 -n mike
-
-if cmp -s tmp.out $srcdir/test2.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test20.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test5 -a asdf -c fdas --eee blah -i sss -i fdsf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 -a asdf -c fdas --eee blah -i sss -i fdsf
-
-if cmp -s tmp.out $srcdir/test20.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test21.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test5 -b asdf -c fdas -g asdf -j homer > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 -b asdf -c fdas -g asdf -j homer
-
-if cmp -s tmp.out $srcdir/test21.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test22.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test5 -a fdsa -b asdf -c fdas > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 -a fdsa -b asdf -c fdas
-
-if cmp -s tmp.out $srcdir/test22.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test23.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test5 -d junk -c fdas > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 -d junk -c fdas
-
-if cmp -s tmp.out $srcdir/test23.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test24.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test5 --aaa dilbert -b asdf -c fdas > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 --aaa dilbert -b asdf -c fdas
-
-if cmp -s tmp.out $srcdir/test24.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test25.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test5 --aaa asdf -c fdas --fff blah -i one -i two > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 --aaa asdf -c fdas --fff blah -i one -i two
-
-if cmp -s tmp.out $srcdir/test25.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test26.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test2 -i 2 -f 4..2 -s asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 2 -f 4..2 -s asdf asdf
-
-if cmp -s tmp.out $srcdir/test26.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test27.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test2 -i 2 -f 4.0.2 -s asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 2 -f 4.0.2 -s asdf asdf
-
-if cmp -s tmp.out $srcdir/test27.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test28.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test2 -i 2a -f 4.2 -s asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 2a -f 4.2 -s asdf asdf
-
-if cmp -s tmp.out $srcdir/test28.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test29.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure...  no hex here, but see test19.cpp for how to use hex 
-../examples/test2 -i 0xA -f 4.2 -s asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 0xA -f 4.2 -s asdf asdf
-
-if cmp -s tmp.out $srcdir/test29.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test3.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test1 -n mike -r > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test1 -n mike -r
-
-if cmp -s tmp.out $srcdir/test3.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test30.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test2 -i 2.1 -f 4.2 -s asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 2.1 -f 4.2 -s asdf asdf
-
-if cmp -s tmp.out $srcdir/test30.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test31.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test3 -i=9a -i=1 -s=asdf asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3 -i=9a -i=1 -s=asdf asdf asdf
-
-if cmp -s tmp.out $srcdir/test31.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test32.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test3 -f=9 -f=1.0.0 -s=asdf asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3 -f=9 -f=1.0.0 -s=asdf asdf asdf
-
-if cmp -s tmp.out $srcdir/test32.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test33.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test5 -a asdf -c fdas --eee blah --ddd -j o --jjj t > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 -a asdf -c fdas --eee blah --ddd -j o --jjj t
-
-if cmp -s tmp.out $srcdir/test33.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test34.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test6 -n homer 2  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test6 -n homer 2 
-
-if cmp -s tmp.out $srcdir/test34.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test35.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test6 -n mike 2  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test6 -n mike 2 
-
-if cmp -s tmp.out $srcdir/test35.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test36.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test6 -n homer 6  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test6 -n homer 6 
-
-if cmp -s tmp.out $srcdir/test36.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test37.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test7 -n homer 2 -n marge 1 3 > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test7 -n homer 2 -n marge 1 3
-
-if cmp -s tmp.out $srcdir/test37.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test38.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test7 -n mike 2 1  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test7 -n mike 2 1 
-
-if cmp -s tmp.out $srcdir/test38.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test39.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test7 2 -n homer -n bart 6  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test7 2 -n homer -n bart 6 
-
-if cmp -s tmp.out $srcdir/test39.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test4.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test1 > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test1
-
-if cmp -s tmp.out $srcdir/test4.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test40.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test1 --help  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test1 --help 
-
-if cmp -s tmp.out $srcdir/test40.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test41.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test2 --help  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 --help 
-
-if cmp -s tmp.out $srcdir/test41.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test42.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test3 --help  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3 --help 
-
-if cmp -s tmp.out $srcdir/test42.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test43.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test4 --help  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test4 --help 
-
-if cmp -s tmp.out $srcdir/test43.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test44.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test5 --help  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 --help 
-
-if cmp -s tmp.out $srcdir/test44.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test45.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test6 --help  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test6 --help 
-
-if cmp -s tmp.out $srcdir/test45.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test46.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test7 --help  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test7 --help 
-
-if cmp -s tmp.out $srcdir/test46.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test47.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test8 -s=bill -i=9 -i=8 -B homer marge bart > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test8 -s=bill -i=9 -i=8 -B homer marge bart
-
-if cmp -s tmp.out $srcdir/test47.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test48.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test8  -s=aaa homer marge bart -- one two > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test8  -s=aaa homer marge bart -- one two
-
-if cmp -s tmp.out $srcdir/test48.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test49.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test8  -s bbb homer marge bart -- -hv two > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test8  -s bbb homer marge bart -- -hv two
-
-if cmp -s tmp.out $srcdir/test49.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test5.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test2 -i 10 -s homer marge bart lisa > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 10 -s homer marge bart lisa
-
-if cmp -s tmp.out $srcdir/test5.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test50.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test8  -s one homer -B -Bh > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test8  -s one homer -B -Bh
-
-if cmp -s tmp.out $srcdir/test50.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test51.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test8  -s=one homer -B > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test8  -s=one homer -B
-
-if cmp -s tmp.out $srcdir/test51.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test52.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test8 -i=9a -i=1 -s=asdf asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test8 -i=9a -i=1 -s=asdf asdf asdf
-
-if cmp -s tmp.out $srcdir/test52.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test53.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # failure
-../examples/test8 -f=9 -f=1.0.0 -s=asdf asdf asdf > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test8 -f=9 -f=1.0.0 -s=asdf asdf asdf
-
-if cmp -s tmp.out $srcdir/test53.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test54.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test8 --help  > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test8 --help 
-
-if cmp -s tmp.out $srcdir/test54.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test55.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test3 --stringTest=asdf - asdf zero one > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test3 --stringTest=asdf - asdf zero one
-
-if cmp -s tmp.out $srcdir/test55.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test56.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test2 -i 1 - -s fdsa one two > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test2 -i 1 - -s fdsa one two
-
-if cmp -s tmp.out $srcdir/test56.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test57.sh

@@ -1,13 +1,5 @@
 #!/bin/sh
-
 # failure
 # This used to fail on the "Too many arguments!" but now fails sooner,
 # and on a more approriate error.
-../examples/test5 --aaa asdf -c fdas --fff blah -i one -i two -j huh > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test5 --aaa asdf -c fdas --fff blah -i one -i two -j huh
-
-if cmp -s tmp.out $srcdir/test57.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test58.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test9 > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test9
-
-if cmp -s tmp.out $srcdir/test58.out; then
-	exit 0
-else
-	exit 1
-fi
-

tests/test59.sh

@@ -1,11 +1,3 @@
 #!/bin/sh
-
 # success
-../examples/test9 -VVV -N --noise -r blah > tmp.out 2>&1
+./simple-test.sh `basename $0 .sh` test9 -VVV -N --noise -r blah
-
-if cmp -s tmp.out $srcdir/test59.out; then
-	exit 0
-else
-	exit 1
-fi
-