From 339a0948c6389cf9e02ee00f17015bc2eef2b27a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 20 Oct 2017 15:47:50 -0400 Subject: [PATCH] fixup! core: Add standard SOURCE_TITLE metadata key --- tests/admin-test.sh | 1 - tests/test-admin-deploy-uboot.sh | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/admin-test.sh b/tests/admin-test.sh index 1d78f3538c..dafbc79b0a 100644 --- a/tests/admin-test.sh +++ b/tests/admin-test.sh @@ -277,7 +277,6 @@ assert_streq ${curr_rev} ${head_rev} echo "ok upgrade with and without override-commit" - ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string "version=${version}" \ --add-metadata-string 'ostree.source-title=libtest os_repository_new_commit()' -b testos/buildmaster/x86_64-runtime \ -s "Build" --tree=dir=${test_tmpdir}/osdata diff --git a/tests/test-admin-deploy-uboot.sh b/tests/test-admin-deploy-uboot.sh index 7791360e04..ec0314770c 100755 --- a/tests/test-admin-deploy-uboot.sh +++ b/tests/test-admin-deploy-uboot.sh @@ -30,6 +30,10 @@ extra_admin_tests=1 . $(dirname $0)/admin-test.sh cd ${test_tmpdir} +# Note this test actually requires a checksum change to /boot, +# because adding the uEnv.txt isn't currently covered by the +# "bootcsum". +os_repository_new_commit "uboot test" "test upgrade multiple kernel args" mkdir -p osdata/usr/lib/ostree-boot cat << 'EOF' > osdata/usr/lib/ostree-boot/uEnv.txt loaduimage=load mmc ${bootpart} ${loadaddr} ${kernel_image}