Merge branch '1.2'

This commit is contained in:
Daniel Aarno 2018-08-02 12:12:56 -07:00
commit c51fb519d6
124 changed files with 265 additions and 728 deletions

8
.gitignore vendored
View File

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

View File

@ -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])
if test "$cv_warn_effective_cxx" = yes; then
AC_MSG_RESULT([$_cv_warn_effective_cxx])
if test "$_cv_warn_effective_cxx" = yes; then
WARN_EFFECTIVE_CXX=-Weffc++
WARN_NO_EFFECTIVE_CXX=-Wno-effc++
fi

View File

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

4
docs/upload.sh Executable file
View File

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

View File

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

View File

@ -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.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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!

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

63
scripts/fix-test.py Executable file
View File

@ -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)

16
scripts/modeline.py Normal file
View File

@ -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)

19
tests/simple-test.sh Executable file
View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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
if cmp -s tmp.out $srcdir/test29.out; then
exit 0
else
exit 1
fi
./simple-test.sh `basename $0 .sh` test2 -i 0xA -f 4.2 -s asdf asdf

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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
if cmp -s tmp.out $srcdir/test57.out; then
exit 0
else
exit 1
fi
./simple-test.sh `basename $0 .sh` test5 --aaa asdf -c fdas --fff blah -i one -i two -j huh

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More