diff options
| author | Yu Liu <yudiliu@google.com> | 2023-03-20 14:43:14 -0700 |
|---|---|---|
| committer | Yu Liu <yudiliu@google.com> | 2023-03-20 14:46:29 -0700 |
| commit | 6b7c316cfc2647d85b2c4b9dcf07f70b743b1408 (patch) | |
| tree | 270057ba740d9b6977215cefa87b456b47bf575f /tests | |
| parent | 94d107020a41115dde1202b94c5fa80680bff808 (diff) | |
| download | soong-6b7c316cfc2647d85b2c4b9dcf07f70b743b1408.tar.gz | |
Treat libcrypto in com.android.tethering differently
This module uses librypto from cronet which is different from the
default one, so the test would always fail.
Bug: 274473434
Test: run the script locally.
Change-Id: I9aac4da0990953db312e2163ee8af05e692f6f3f
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/dcla_apex_comparison_test.sh | 2 | ||||
| -rwxr-xr-x | tests/run_integration_tests.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/dcla_apex_comparison_test.sh b/tests/dcla_apex_comparison_test.sh index 2ecb876fb..97ae97ecb 100755 --- a/tests/dcla_apex_comparison_test.sh +++ b/tests/dcla_apex_comparison_test.sh @@ -112,7 +112,7 @@ function compare_dcla_libs() { sha="${sha% *}" if [ "${prev_sha}" == "" ]; then prev_sha="${sha}" - elif [ "${sha}" != "${prev_sha}" ]; then + elif [ "${sha}" != "${prev_sha}" ] && { [ "${lib}" != "libcrypto.so" ] || [ "${module}" != "com.android.tethering" ]; }; then echo "Test failed, ${lib} has different hash value" exit 1 fi diff --git a/tests/run_integration_tests.sh b/tests/run_integration_tests.sh index 7fa0dae27..e1aa70c73 100755 --- a/tests/run_integration_tests.sh +++ b/tests/run_integration_tests.sh @@ -15,8 +15,8 @@ TOP="$(readlink -f "$(dirname "$0")"/../../..)" # mock client. "$TOP/build/soong/tests/apex_comparison_tests.sh" "$TOP/build/soong/tests/apex_comparison_tests.sh" "module_arm64only" -#extra_build_params=--bazel-mode-staging "$TOP/build/soong/tests/dcla_apex_comparison_test.sh" -#BUILD_BROKEN_DISABLE_BAZEL=true "$TOP/build/soong/tests/dcla_apex_comparison_test.sh" +extra_build_params=--bazel-mode-staging "$TOP/build/soong/tests/dcla_apex_comparison_test.sh" +BUILD_BROKEN_DISABLE_BAZEL=true "$TOP/build/soong/tests/dcla_apex_comparison_test.sh" "$TOP/build/soong/tests/apex_cc_module_arch_variant_tests.sh" "$TOP/build/soong/tests/apex_cc_module_arch_variant_tests.sh" "aosp_arm" "armv7-a" "$TOP/build/soong/tests/apex_cc_module_arch_variant_tests.sh" "aosp_cf_arm64_phone" "armv8-a" "cortex-a53" |