summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2023-02-28 14:39:09 +0200
committerTimo Teräs <timo.teras@iki.fi>2023-02-28 14:43:35 +0200
commitfd8f39f1d54c3b56d16a494898e5a753e2c71715 (patch)
treee926627298ba66b1d663b09979ecf3fa68a1fe92 /test
parent48b4565f344e0ced9d23f612f8938b861c6886a4 (diff)
downloadapk-tools-fd8f39f1d54c3b56d16a494898e5a753e2c71715.tar.gz
apk-tools-fd8f39f1d54c3b56d16a494898e5a753e2c71715.tar.bz2
apk-tools-fd8f39f1d54c3b56d16a494898e5a753e2c71715.tar.xz
apk-tools-fd8f39f1d54c3b56d16a494898e5a753e2c71715.zip
version: fix leading zero stripping
Only the leading zeroes should be ignored. Handle properly if the version component is actually zero. fixes #10880
Diffstat (limited to 'test')
-rw-r--r--test/version.data4
-rwxr-xr-xtest/version.sh8
2 files changed, 9 insertions, 3 deletions
diff --git a/test/version.data b/test/version.data
index bb1aa9e..8db0b45 100644
--- a/test/version.data
+++ b/test/version.data
@@ -727,3 +727,7 @@
1.0_p10-r0 > 1.0_p9-r0
0.1.0_alpha_pre2 < 0.1.0_alpha
1.0.0_pre20191002222144-r0 < 1.0.0_pre20210530193627-r0
+6.0_pre1 < 6.0
+6.1_pre1 < 6.1
+6.0_p1 > 6.0
+6.1_p1 > 6.1
diff --git a/test/version.sh b/test/version.sh
index 18199a6..f639e19 100755
--- a/test/version.sh
+++ b/test/version.sh
@@ -1,16 +1,18 @@
#!/bin/sh
fail=0
-cat version.data | while read a result b rest ; do
+while read a result b rest ; do
output="$(../src/apk version -t "$a" "$b")"
if [ "$output" != "$result" ] ; then
echo "$a $result $b, but got $output"
- fail=$(($fail+1))
+ fail=$((fail+1))
fi
-done
+done < version.data
if [ "$fail" == "0" ]; then
echo "OK: version checking works"
+else
+ echo "FAIL: $fail version checks failed"
fi
exit $fail