Skip to content
Snippets Groups Projects
Commit f5df274d authored by Timo Teräs's avatar Timo Teräs
Browse files

test: don't use temporary files for diffing output

parent f66d84fc
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@
# shellcheck disable=SC2034 # various variables are not used always
set -e
set -eo pipefail
assert() {
echo "$*"
......
......@@ -12,36 +12,31 @@ $APK mkpkg -I name:test-a -I version:1.0 -o test-a-1.0.apk
$APK mkpkg -I name:test-b -I version:1.0 -o test-b-1.0.apk
$APK mkndx -q -o index.adb test-a-1.0.apk
$APK mkndx -vv -o index-reindex.adb -x index.adb test-a-1.0.apk test-b-1.0.apk > mkndx.log
diff -u - mkndx.log <<EOF || assert "wrong mkndx result"
$APK mkndx -vv -o index-reindex.adb -x index.adb test-a-1.0.apk test-b-1.0.apk | diff -u /dev/fd/4 4<<EOF - || assert "wrong mkndx result"
test-a-1.0.apk: indexed from old index
test-b-1.0.apk: indexed new package
Index has 2 packages (of which 1 are new)
EOF
$APK mkndx --pkgname-spec 'https://test/${name}-${version}.apk' -o index.adb test-a-1.0.apk test-b-1.0.apk
$APK fetch --url --simulate --from none --repository index.adb --pkgname-spec '${name}_${version}.pkg' test-a test-b > fetch.log 2>&1
diff -u - fetch.log <<EOF || assert "wrong fetch result"
$APK fetch --url --simulate --from none --repository index.adb --pkgname-spec '${name}_${version}.pkg' test-a test-b 2>&1 | diff -u /dev/fd/4 4<<EOF - || assert "wrong fetch result"
https://test/test-a-1.0.apk
https://test/test-b-1.0.apk
EOF
$APK mkndx --pkgname-spec '${name:3}/${name}-${version}.apk' -o index.adb test-a-1.0.apk test-b-1.0.apk
$APK fetch --url --simulate --from none --repository "test:/$PWD/index.adb" --pkgname-spec '${name}_${version}.pkg' test-a test-b > fetch.log 2>&1
diff -u - fetch.log <<EOF || assert "wrong fetch result"
$APK fetch --url --simulate --from none --repository "test:/$PWD/index.adb" --pkgname-spec '${name}_${version}.pkg' test-a test-b 2>&1 | diff -u /dev/fd/4 4<<EOF - || assert "wrong fetch result"
test:/$PWD/tes/test-a-1.0.apk
test:/$PWD/tes/test-b-1.0.apk
EOF
$APK mkndx --pkgname-spec '${name:3}/${name}-${version}.apk' -o index.adb test-a-1.0.apk test-b-1.0.apk
$APK fetch --url --simulate --from none --repository index.adb --pkgname-spec '${name}_${version}.pkg' test-a test-b > fetch.log 2>&1
diff -u - fetch.log <<EOF || assert "wrong fetch result"
$APK fetch --url --simulate --from none --repository index.adb --pkgname-spec '${name}_${version}.pkg' test-a test-b 2>&1 | diff -u /dev/fd/4 4<<EOF - || assert "wrong fetch result"
./tes/test-a-1.0.apk
./tes/test-b-1.0.apk
EOF
$APK mkndx -vv --filter-spec '${name}-${version}' --pkgname-spec 'http://test/${name}-${version}.apk' -x index.adb -o index-filtered.adb test-a-1.0
$APK fetch --url --simulate --from none --repository index-filtered.adb --pkgname-spec '${name}_${version}.pkg' test-a > fetch.log 2>&1
diff -u fetch.log - <<EOF || assert "wrong fetch result"
$APK fetch --url --simulate --from none --repository index-filtered.adb --pkgname-spec '${name}_${version}.pkg' test-a 2>&1 | diff -u /dev/fd/4 4<<EOF - || assert "wrong fetch result"
http://test/test-a-1.0.apk
EOF
......@@ -28,8 +28,7 @@ APK="$APK --allow-untrusted --no-interactive --force-no-chroot --uvol-manager $T
$APK add --initdb $TEST_USERMODE
reset_uvol_db
$APK add uvol-data-1.0.apk > apk.log 2>&1 || assert "uvol-data should have succeeded"
diff -u - apk.log <<EOF || assert "wrong scripts result"
$APK add uvol-data-1.0.apk 2>&1 | diff -u /dev/fd/4 4<<EOF - || assert "wrong scripts result"
(1/1) Installing uvol-data (1.0)
uvol(create): uvol-test: create data 13 ro
uvol(write): uvol-test: write data 13
......@@ -39,8 +38,7 @@ OK: 0 MiB in 1 packages
EOF
reset_uvol_db
$APK add uvol-scriptfail-1.0.apk > apk.log 2>&1 && assert "uvol-scriptail should have failed"
diff -u - apk.log <<EOF || assert "wrong scripts result"
! $APK add uvol-scriptfail-1.0.apk 2>&1 | diff -u - /dev/fd/4 4<<EOF || assert "wrong scripts result"
(1/1) Installing uvol-scriptfail (1.0)
uvol(create): uvol-test: create scriptfail 33 ro
uvol(write): uvol-test: write scriptfail 33
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment