- change popt exec alias in oreder to exec rpm children.

- split rpm into 5 pieces along major mode fault lines with popt glue.

CVS patchset: 3750
CVS date: 2000/05/24 17:53:35

1 files changed, 6 insertions, 5 deletions

diff --git a/popt/testit.sh b/popt/testit.sh
index e9b7198aa..a3221761f 100755
--- a/popt/testit.sh
+++ b/popt/testit.sh
@@ -15,6 +15,7 @@ run() {
 }
 
 builddir=`pwd`
+srcdir=$builddir
 cd ${srcdir}
 test1=${builddir}/test1
 echo "Running tests in `pwd`"
@@ -39,11 +40,11 @@ run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
 POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
-run test1 "test1 - 19" "${test1} ;" --echo-args
-run test1 "test1 - 20" "${test1} ; --arg1" --echo-args --arg1
-run test1 "test1 - 21" "${test1} ; --arg2 something" -T something -e
-run test1 "test1 - 22" "${test1} ; --arg2 something -- more args" -T something -a more args
-run test1 "test1 - 23" "${test1} ; --echo-args -a" --echo-args -e -a
+run test1 "test1 - 19" "" --echo-args
+run test1 "test1 - 20" "--arg1" --echo-args --arg1
+run test1 "test1 - 21" "--arg2 something" -T something -e
+run test1 "test1 - 22" "--arg2 something -- more args" -T something -a more args
+run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
 run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo