summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authordcashman <dcashman@google.com>2016-03-22 16:08:26 -0700
committerdcashman <dcashman@google.com>2016-03-22 16:11:08 -0700
commitb543b4ed380bd3571f23225b216ad82860d281ee (patch)
treef488a1ad69679b0c41bc79b226a9de47a43899ac /tests
parenta5d29203685774a9ef8c188d69d7f4cac69578e4 (diff)
downloadextras-b543b4ed380bd3571f23225b216ad82860d281ee.tar.gz
aslr_test: Fix typo.
Bug: 26512380 Change-Id: Ia65986700f198a0f09db4a45a7d1bde173e557e6
Diffstat (limited to 'tests')
-rw-r--r--tests/kernel.config/aslr_rec_test.cpp2
-rw-r--r--tests/kernel.config/aslr_test.cpp4
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) {