From bb8ec8044f5181e946a7fb8977fb6d0f4a80641d Mon Sep 17 00:00:00 2001 From: Kristian Amlie Date: Tue, 15 Mar 2022 09:15:53 +0100 Subject: [PATCH] Automatically skip non-qemu board tests for mender-convert. Changelog: None Signed-off-by: Kristian Amlie --- scripts/test/run-tests.sh | 9 --------- tests/mender-image-tests | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/scripts/test/run-tests.sh b/scripts/test/run-tests.sh index 7a83ec3..377c9c4 100755 --- a/scripts/test/run-tests.sh +++ b/scripts/test/run-tests.sh @@ -83,7 +83,6 @@ test_result=0 if [ -n "$PREBUILT_IMAGE" ]; then run_tests $PREBUILT_IMAGE \ - "-k" "'not test_update'" \ || test_result=$? exit $test_result @@ -117,8 +116,6 @@ else "release-1" \ "input/${RASPBIAN_IMAGE}" \ "--config configs/raspberrypi3_config $EXTRA_CONFIG" \ - -- \ - "-k" "'not test_update'" \ || test_result=$? fi @@ -132,8 +129,6 @@ else "release-1" \ "input/${BBB_DEBIAN_SDCARD_IMAGE_UNCOMPRESSED}" \ "--config configs/beaglebone_black_debian_sdcard_config $EXTRA_CONFIG" \ - -- \ - "-k" "'not test_update'" \ || test_result=$? rm -rf deploy @@ -145,8 +140,6 @@ else "release-1" \ "input/${BBB_DEBIAN_EMMC_IMAGE_UNCOMPRESSED}" \ "--config configs/beaglebone_black_debian_emmc_config $EXTRA_CONFIG" \ - -- \ - "-k" "'not test_update'" \ || test_result=$? fi @@ -157,8 +150,6 @@ else "release-1" \ "input/${UBUNTU_SERVER_RPI_IMAGE_COMPRESSED}" \ "--config configs/raspberrypi3_config $EXTRA_CONFIG" \ - -- \ - "-k" "'not test_update'" \ || test_result=$? fi diff --git a/tests/mender-image-tests b/tests/mender-image-tests index 8af131b..626c9f4 160000 --- a/tests/mender-image-tests +++ b/tests/mender-image-tests @@ -1 +1 @@ -Subproject commit 8af131b9eface1555d2141d513c0dd6860c7815f +Subproject commit 626c9f43f615531d4ec45c2e388b8829d91e087c