aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2014-03-11 13:23:46 +0200
committerJukka Jylänki <jujjyl@gmail.com>2014-03-11 13:23:46 +0200
commit5c692fd82fcfafc0685f1c73328f66f905b52305 (patch)
treea7621a259eeda9af4390917c5c12c34df90e1594
parent7998d7bc93d638666510fb515b58fd3715ca52e4 (diff)
Clean up warnings in emscripten_log test.
-rw-r--r--tests/emscripten_log/emscripten_log.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/emscripten_log/emscripten_log.cpp b/tests/emscripten_log/emscripten_log.cpp
index 5973e94c..f4cc41db 100644
--- a/tests/emscripten_log/emscripten_log.cpp
+++ b/tests/emscripten_log/emscripten_log.cpp
@@ -5,10 +5,6 @@
#define STRINGIZE_HELPER(x) #x
#define STRINGIZE(x) STRINGIZE_HELPER(x)
-#ifndef REPORT_RESULT
-#define REPORT_RESULT int dummy
-#endif
-
int result = 1; // If 1, this test succeeded.
// A custom assert macro to test varargs routing to emscripten_log().
@@ -134,11 +130,10 @@ void __attribute__((noinline)) Foo() // Arbitrary function signature to add some
int main()
{
Foo<int>();
-#ifndef RUN_FROM_JS_SHELL
+#ifdef REPORT_RESULT
REPORT_RESULT();
- return 0;
-#else
+#endif
if (result)
printf("Success!\n");
-#endif
+ return 0;
}