Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/pactest
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-05-29 23:12:44 -0500
committerDan McGee <dan@archlinux.org>2008-05-30 16:54:15 -0500
commit54e1e3e642d834d8c676db7f74e95c6e24b19eab (patch)
tree04d43254bbfcdc056ed2ae27282d8dcc4e95264c /pactest
parent2cd0a87b3f63abacaa3548ae24f764c42e00a3ff (diff)
Fix versioncmp regression after update
Commit 84283672853350a84d2a71b72dc06e180cad1587 introduced the regression, and a previous commit introduced the vercmptest.sh test script to track down these issues. This commit solves the problem by removing the previous attempt at locating the pkgrel portions and replacing it with something that performs the correct logic. While tracking down everything I needed to, I also found a mistake in one of the pactests which is fixed here as well as increased the functionality and verbosity of the vercmptest script to both print out each test it is running as well as automatically run the mirror of each test case. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'pactest')
-rw-r--r--pactest/tests/upgrade058.py2
-rwxr-xr-xpactest/vercmptest.sh39
2 files changed, 32 insertions, 9 deletions
diff --git a/pactest/tests/upgrade058.py b/pactest/tests/upgrade058.py
index 76416802..109289ea 100644
--- a/pactest/tests/upgrade058.py
+++ b/pactest/tests/upgrade058.py
@@ -14,4 +14,4 @@ self.addpkg(p)
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=1")
-self.addrule("!PKG_VERSION=pkg2|1.1")
+self.addrule("!PKG_VERSION=pkg2|1.1-1")
diff --git a/pactest/vercmptest.sh b/pactest/vercmptest.sh
index 62a3e32c..f8d457ee 100755
--- a/pactest/vercmptest.sh
+++ b/pactest/vercmptest.sh
@@ -19,22 +19,43 @@
# default binary if one was not specified as $1
bin='vercmp'
-# holds count of failed tests
+# holds counts of tests
+total=0
failure=0
# args:
+# pass ver1 ver2 ret expected
+pass() {
+ echo "test: ver1: $1 ver2: $2 ret: $3 expected: $4"
+ echo " --> pass"
+}
+
+# args:
# fail ver1 ver2 ret expected
fail() {
- echo "unexpected failure:"
- echo " ver1: $1 ver2: $2 ret: $3 expected: $4"
+ echo "test: ver1: $1 ver2: $2 ret: $3 expected: $4"
+ echo " ==> FAILURE"
failure=$(expr $failure + 1)
}
# args:
# runtest ver1 ver2 expected
runtest() {
+ # run the test
ret=$($bin $1 $2)
- [ $ret -eq $3 ] || fail $1 $2 $ret $3
+ func='pass'
+ [ $ret -eq $3 ] || func='fail'
+ $func $1 $2 $ret $3
+ total=$(expr $total + 1)
+ # and run its mirror case just to be sure
+ reverse=0
+ [ $3 -eq 1 ] && reverse=-1
+ [ $3 -eq -1 ] && reverse=1
+ ret=$($bin $2 $1)
+ func='pass'
+ [ $ret -eq $reverse ] || func='fail'
+ $func $1 $2 $ret $reverse
+ total=$(expr $total + 1)
}
# use first arg as our binary if specified
@@ -44,11 +65,9 @@ runtest() {
# all similar length, no pkgrel
runtest 1.5.0 1.5.0 0
-runtest 1.5.0 1.5.1 -1
runtest 1.5.1 1.5.0 1
# mixed length
-runtest 1.5 1.5.1 -1
runtest 1.5.1 1.5 1
# with pkgrel, simple
@@ -65,13 +84,17 @@ runtest 1.5-2 1.5.1-2 -1
# mixed pkgrel inclusion
runtest 1.5 1.5-1 0
runtest 1.5-1 1.5 0
+runtest 1.1-1 1.1 0
+runtest 1.0-1 1.1 -1
+runtest 1.1-1 1.0 1
#END TESTS
+echo
if [ $failure -eq 0 ]; then
- echo "All tests successful"
+ echo "All $total tests successful"
exit 0
fi
-echo "$failure failed tests"
+echo "$failure of $total tests failed"
exit 1