From 0ceb138d877101542934b7729f9497bc4c9a039a Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 18 Jan 2017 08:32:10 +1100 Subject: [PATCH] Don't set base element path in run_functests.sh DIB automatically includes it's base elements in the ELEMENT_PATH; this double-set means the base elements are in the path twice, leading to some tools that walk the element list (package-installs-squash, for example) to do things twice. Change-Id: Icf631427601cfd2abed436711cedb9e002fff8f9 --- tests/run_functests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run_functests.sh b/tests/run_functests.sh index 14bd39654..d8459b028 100755 --- a/tests/run_functests.sh +++ b/tests/run_functests.sh @@ -97,7 +97,7 @@ function run_disk_element_test() { if break="after-error" break_outside_target=1 \ break_cmd="cp -v \$TMP_MOUNT_PATH/tmp/dib-test-should-fail ${dest_dir} || true" \ DIB_SHOW_IMAGE_USAGE=1 \ - ELEMENTS_PATH=$DIB_ELEMENTS:$DIB_ELEMENTS/$element/test-elements \ + ELEMENTS_PATH=$DIB_ELEMENTS/$element/test-elements \ $DIB_CMD -x -t tar,qcow2 ${use_tmp_flag} -o $dest_dir/image -n $element $test_element 2>&1 \ | log_with_prefix "${element}/${test_element}"; then