StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix flakey test"

Browse Source
This commit is contained in:
Usta (Tsering) Shrestha
2023-02-14 16:37:04 +00:00
committed by Gerrit Code Review
parent da92c3ecba 9393264eff
commit 23da27c321
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/bootstrap_test.sh
View File

@@ -803,7 +803,6 @@ function test_bp2build_fails_fast {
setup setup
mkdir -p "a/${GENERATED_BUILD_FILE_NAME}" mkdir -p "a/${GENERATED_BUILD_FILE_NAME}"
touch a/a.txt
cat > a/Android.bp <<EOF cat > a/Android.bp <<EOF
filegroup { filegroup {
name: "a", name: "a",
@@ -813,7 +812,6 @@ filegroup {
EOF EOF
mkdir -p "b/${GENERATED_BUILD_FILE_NAME}" mkdir -p "b/${GENERATED_BUILD_FILE_NAME}"
touch b/b.txt
cat > b/Android.bp <<EOF cat > b/Android.bp <<EOF
filegroup { filegroup {
name: "b", name: "b",
@@ -826,8 +824,8 @@ EOF
fail "Build should have failed" fail "Build should have failed"
fi fi
grep -q "a/${GENERATED_BUILD_FILE_NAME}' exist" "$MOCK_TOP/errors" || fail "Error for a/${GENERATED_BUILD_FILE_NAME} not found" # we should expect at least one error
grep -q -v "b/${GENERATED_BUILD_FILE_NAME}' exist" "$MOCK_TOP/errors" || fail "Error for b/${GENERATED_BUILD_FILE_NAME} found but not expected" grep -q -E "(a|b)/${GENERATED_BUILD_FILE_NAME}' exist" "$MOCK_TOP/errors" || fail "Error for ${GENERATED_BUILD_FILE_NAME} not found"
} }
function test_bp2build_back_and_forth_null_build { function test_bp2build_back_and_forth_null_build {