X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnative_client_sdk%2Fsrc%2Ftests%2Fnacl_io_test%2Fmain.cc;h=31414e64c5e86d77ff324bd8cc8dcc00dd862005;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=326c18f12c443f48cc76e56cb17f0d4029351b1d;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/native_client_sdk/src/tests/nacl_io_test/main.cc b/src/native_client_sdk/src/tests/nacl_io_test/main.cc
index 326c18f..31414e6 100644
--- a/src/native_client_sdk/src/tests/nacl_io_test/main.cc
+++ b/src/native_client_sdk/src/tests/nacl_io_test/main.cc
@@ -5,17 +5,6 @@
 #include <string>
 
 #include "gtest/gtest.h"
-
-#if defined(SEL_LDR)
-
-int main(int argc, char* argv[]) {
-  setenv("TERM", "xterm-256color", 0);
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-
-#else
-
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi_simple/ps_main.h"
@@ -54,14 +43,15 @@ class GTestEventListener : public ::testing::EmptyTestEventListener {
 };
 
 int example_main(int argc, char* argv[]) {
+  setenv("TERM", "xterm-256color", 0);
   ::testing::InitGoogleTest(&argc, argv);
-  ::testing::UnitTest::GetInstance()->listeners()
-      .Append(new GTestEventListener());
+  if (PSGetInstanceId() != 0) {
+    ::testing::UnitTest::GetInstance()->listeners()
+        .Append(new GTestEventListener());
+  }
   return RUN_ALL_TESTS();
 }
 
 // Register the function to call once the Instance Object is initialized.
 // see: pappi_simple/ps_main.h
 PPAPI_SIMPLE_REGISTER_MAIN(example_main);
-
-#endif