Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Unified Diff: tests/exception_test/exception_test.c

Issue 562853003: Make pnacl_generate_pexe=0 nonsfi_nacl=1 bitcode=1 work. (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: more changes to get ARM linking. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/common/register_set.h ('k') | tests/exception_test/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/exception_test/exception_test.c
diff --git a/tests/exception_test/exception_test.c b/tests/exception_test/exception_test.c
index b00d3a40a7e51a235b88777619ec269947818276..01b887b266f2f40672b539627d482985d718f372 100644
--- a/tests/exception_test/exception_test.c
+++ b/tests/exception_test/exception_test.c
@@ -314,7 +314,7 @@ void test_catching_various_exception_types(void) {
exit(1);
}
-#if defined(__i386__) || defined(__x86_64__)
+#if !NONSFI_MODE && (defined(__i386__) || defined(__x86_64__))
printf("Testing hlt...\n");
if (!setjmp(g_jmp_buf)) {
__asm__("hlt");
@@ -340,7 +340,7 @@ void test_catching_various_exception_types(void) {
}
-#if defined(__i386__) || defined(__x86_64__)
+#if !NONSFI_MODE && (defined(__i386__) || defined(__x86_64__))
int get_x86_direction_flag(void);
@@ -404,7 +404,7 @@ int TestMain(void) {
RUN_TEST(test_exceptions_on_non_main_thread);
RUN_TEST(test_catching_various_exception_types);
-#if defined(__i386__) || defined(__x86_64__)
+#if !NONSFI_MODE && (defined(__i386__) || defined(__x86_64__))
RUN_TEST(test_get_x86_direction_flag);
RUN_TEST(test_unsetting_x86_direction_flag);
#endif
« no previous file with comments | « tests/common/register_set.h ('k') | tests/exception_test/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698