Fix macro name as unique 99/172099/1 accepted/tizen/unified/20180329.125122 submit/tizen/20180312.013912 submit/tizen/20180322.011823 submit/tizen/20180327.003656
authorsangwan.kwon <sangwan.kwon@samsung.com>
Mon, 12 Mar 2018 00:39:54 +0000 (09:39 +0900)
committersangwan.kwon <sangwan.kwon@samsung.com>
Mon, 12 Mar 2018 00:39:54 +0000 (09:39 +0900)
Change-Id: I86e3b679de357ab27625233410f0a5c50947e3a7
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>
tests/test-launcher.cpp
tests/test-util.hxx

index aa5ea39..f36fae8 100644 (file)
@@ -47,9 +47,9 @@ TESTCASE(TRUST_ANCHOR_LAUNCH)
        TEST_EXPECT(true, pid >= 0);
 
        if (pid == 0) {
-               TIME_MEASURE_START
+               TANCHOR_TIME_MEASURE_START
                ret = ta.launch();
-               TIME_MEASURE_END
+               TANCHOR_TIME_MEASURE_END
                TEST_EXPECT(true, ret == TRUST_ANCHOR_ERROR_NONE);
 
                // check file-system
@@ -83,9 +83,9 @@ TESTCASE(TRUST_ANCHOR_LAUNCH_WITH_SYS)
        TEST_EXPECT(true, pid >= 0);
 
        if (pid == 0) {
-               TIME_MEASURE_START
+               TANCHOR_TIME_MEASURE_START
                ret = ta.launch();
-               TIME_MEASURE_END
+               TANCHOR_TIME_MEASURE_END
                TEST_EXPECT(true, ret == TRUST_ANCHOR_ERROR_NONE);
 
                // check file-system
index 370e2c2..5f9ab1f 100644 (file)
 
 using namespace std::chrono;
 
-#define TIME_MEASURE_START auto start = system_clock::now(); \
-                                                  std::cout << "Start to measure time" << std::endl;
-#define TIME_MEASURE_END auto end = system_clock::now(); \
-                                                auto mill = duration_cast<milliseconds>(end - start); \
-                                                std::cout << "Elapsed time : " << mill.count() \
-                                                                  << "ms" << std::endl;
+#define TANCHOR_TIME_MEASURE_START auto start = system_clock::now(); \
+                                                                  std::cout << "Start to measure time" << std::endl;
+#define TANCHOR_TIME_MEASURE_END auto end = system_clock::now(); \
+                                                                auto mill = duration_cast<milliseconds>(end - start); \
+                                                                std::cout << "Elapsed time : " << mill.count() \
+                                                                                  << "ms" << std::endl;
 
 namespace test {
 namespace util {