aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-09-24 23:07:19 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-09-24 23:07:19 +0000
commit739e5b4071a226bdfe62f56dd330288f8aef00b5 (patch)
tree0048e54012df3c8e291e958d2e45b821d0b01b14
parent7fcaafb19d56c97fb331aed2f25cb844ec9535e1 (diff)
parent61cb24b2dd44709c72c74936bdb4d0204429b446 (diff)
downloadlinux-kselftest-739e5b4071a226bdfe62f56dd330288f8aef00b5.tar.gz
Snap for 5027106 from 61cb24b2dd44709c72c74936bdb4d0204429b446 to pi-b4s4-releaseandroid-9.0.0_r39android-9.0.0_r38pie-b4s4-release
Change-Id: I119679c0df28c3a4a470e54397744c7ca88931cf
-rw-r--r--Android.bp1
-rw-r--r--android/kselftest_test_list.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index e507cb9d498a..6cf8cf1129ff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -382,6 +382,7 @@ cc_test {
// that its interpreter doesn't destroy its initial state.
ldflags: ["-Wl,-ereal_start"],
static_executable: true,
+ test_per_src: false,
defaults: ["kselftest_defaults"],
}
diff --git a/android/kselftest_test_list.mk b/android/kselftest_test_list.mk
index 9f1ec1a68e34..aa917a834253 100644
--- a/android/kselftest_test_list.mk
+++ b/android/kselftest_test_list.mk
@@ -53,7 +53,7 @@ kselftest_modules += \
kselftest_vm_tests_on-fault-limit \
kselftest_vm64_tests_virtual_address_range \
kselftest_x86_ptrace_syscall \
- kselftest_x86_tests_check_initial_reg_state \
+ kselftest_x86_check_initial_reg_state \
kselftest_x86_tests_ldt_gdt \
kselftest_x86_tests_single_step_syscall \
kselftest_x86_tests_syscall_arg_fault \