From da6791ab7c4e9aeba9f61b907e998b072aadd3c0 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 22 Sep 2022 05:38:17 +0000 Subject: [PATCH 1/4] tests: add missed test_init() invocation Completes commit 9500e296a93c ("tests: reduce duplication with new test_init() function") Signed-off-by: Marc Herbert --- tests/tests.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests.bats b/tests/tests.bats index bee7393..979badd 100644 --- a/tests/tests.bats +++ b/tests/tests.bats @@ -61,8 +61,7 @@ teardown() } @test "tarball_multi_2_1_1a" { - pushd "$RUN_DIR"/ || exit 1 - load 'common_helpers.bash'; set_constants + test_init "$TOP_DIR"/tarball_multi_releases.bash \ v2.2.x/sof-v2.2 v1.8.x/sof-v1.8-rc2 v1.9.x/tools-v1.9-rc1/ \ @@ -74,6 +73,7 @@ teardown() popd || exit 1 } +# You MUST call popd at the end test_init() { pushd "$RUN_DIR"/ || exit 1 From 5aee638cdf7e5d723d2e3b765f076b78376b4362 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 22 Sep 2022 05:39:28 +0000 Subject: [PATCH 2/4] tarball_multi_releases: add compability with older releases Use -f to delete .github/ and others not to fail when it's missing. Signed-off-by: Marc Herbert --- tarball_multi_releases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tarball_multi_releases.bash b/tarball_multi_releases.bash index 3855c39..a01fa25 100755 --- a/tarball_multi_releases.bash +++ b/tarball_multi_releases.bash @@ -86,7 +86,7 @@ main() ) # Delete everything else - rm -r "${archive_name:?}"/* "${archive_name:?}"/.github + rm -rf "${archive_name:?}"/* "${archive_name:?}"/.github # Move the selected things back in place (set -x; mv _selected_versions/* "$archive_name"/ ) From 09a469ebfb9d4fde2a439b119d87eef5faee7b7f Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 22 Sep 2022 06:09:05 +0000 Subject: [PATCH 3/4] tarball_multi_releases: add missing empty "$ver" file for install.sh This makes tarball_multi_releases.sh output consistent with tarball_one_version.sh It's not strictly required by install.sh but it's documented and expected. Signed-off-by: Marc Herbert --- tarball_multi_releases.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tarball_multi_releases.bash b/tarball_multi_releases.bash index a01fa25..974112f 100755 --- a/tarball_multi_releases.bash +++ b/tarball_multi_releases.bash @@ -121,6 +121,8 @@ main() radix=${d%-WIP} ( set -x; mv "$d" "${radix}-$last_ver") done + # for install.sh convenience + touch "$last_ver" ) local manifest_file="$archive_name"/manifest.txt From 5e9f93aa28ff7f25155ae483ecb3aa860cf9fb97 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 22 Sep 2022 06:12:23 +0000 Subject: [PATCH 4/4] New tests comparing tarball_multi_releases and tarball_one_version This ensures consistency and found a minor bug: missing empty "$ver" file. Signed-off-by: Marc Herbert --- tests/tests.bats | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/tests.bats b/tests/tests.bats index 979badd..091bb60 100644 --- a/tests/tests.bats +++ b/tests/tests.bats @@ -37,6 +37,14 @@ teardown() test_tarball_one_version v1.8.x v1.8 v1.8 } +@test "tarball_multi_releases single 2.1.1" { + test_tarball_multi_single v2.1.x v2.1.1 +} + +@test "tarball_multi_releases single 1.8" { + test_tarball_multi_single v1.8.x v1.8 +} + @test "tarball_topologies_only 2.2.1" { local ver=v2.2.1 test_init @@ -95,6 +103,27 @@ test_tarball_one_version() popd || exit 1 } +# Test the ability of the newer "multi" script to recreate older, single +# version releases that were created with the older +# tarball_one_version.sh +test_tarball_multi_single() +{ + local vdir="$1" + local ver="$2" + test_init + get_release "$ver"/sof-bin-"$ver".tar.gz + + "$TOP_DIR"/tarball_multi_releases.bash -g "$ver" \ + "$vdir"/sof-"$ver" "$vdir"/sof-tplg-"$ver" "$vdir"/tools-"$ver" + tar xf sof-bin-"$ver".tar.gz + + # Cheat a little bit; these files are brand new. + rm sof-bin-"$ver"/manifest.txt sof-bin-"$ver"/sha256sum.txt + + diff -qr "$EXTR_REFS"/sof-bin-"$ver" sof-bin-"$ver" + popd || exit 1 +} + test_tarball_topologies_only() { local dir="$1" ver="$2"