diff options
| author | dcashman <dcashman@google.com> | 2016-03-22 23:42:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-22 23:42:25 +0000 |
| commit | 9afaf2e35d99a4e352f7b5a444aa60ee78c493a2 (patch) | |
| tree | c2f382885ce84f1b83e9d7a7c1ff3764b2391941 /tests | |
| parent | e1473dffa6aef588b603b776eacc4b7a0186f4c0 (diff) | |
| parent | b543b4ed380bd3571f23225b216ad82860d281ee (diff) | |
| download | extras-9afaf2e35d99a4e352f7b5a444aa60ee78c493a2.tar.gz | |
aslr_test: Fix typo.
am: b543b4e
* commit 'b543b4ed380bd3571f23225b216ad82860d281ee':
aslr_test: Fix typo.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kernel.config/aslr_rec_test.cpp | 2 | ||||
| -rw-r--r-- | tests/kernel.config/aslr_test.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/kernel.config/aslr_rec_test.cpp b/tests/kernel.config/aslr_rec_test.cpp index 3dc61e6e..e154424a 100644 --- a/tests/kernel.config/aslr_rec_test.cpp +++ b/tests/kernel.config/aslr_rec_test.cpp @@ -17,7 +17,7 @@ #include "aslr_test.h" /* run tests if on supported arch */ -#if defined(__x86__64__) || defined(__i386__) || defined(__aarch64__) || defined(__arm__) +#if defined(__x86_64__) || defined(__i386__) || defined(__aarch64__) || defined(__arm__) /* make sure the default entropy values matches what we expect */ TEST_F(AslrMmapTest, match_default) { diff --git a/tests/kernel.config/aslr_test.cpp b/tests/kernel.config/aslr_test.cpp index ff19a109..ef47f4f8 100644 --- a/tests/kernel.config/aslr_test.cpp +++ b/tests/kernel.config/aslr_test.cpp @@ -145,7 +145,7 @@ unsigned int AslrMmapTest::def_cmpt, AslrMmapTest::min_cmpt, AslrMmapTest::max_c void AslrMmapTest::SetUpTestCase() { /* set up per-arch values */ -#if defined(__x86__64__) +#if defined(__x86_64__) def = 32; min = 28; max = 32; @@ -211,7 +211,7 @@ void AslrMmapTest::TearDown() { } /* run tests only if on supported arch */ -#if defined(__x86__64__) || defined(__i386__) || defined(__aarch64__) || defined(__arm__) +#if defined(__x86_64__) || defined(__i386__) || defined(__aarch64__) || defined(__arm__) TEST_F(AslrMmapTest, entropy_min_def) { if (user32) { |