From ce42018dde79da5f083de5f713f77d0a8a817a40 Mon Sep 17 00:00:00 2001 From: "sangwan.kwon" Date: Mon, 12 Mar 2018 09:39:54 +0900 Subject: [PATCH] Fix macro name as unique Change-Id: I86e3b679de357ab27625233410f0a5c50947e3a7 Signed-off-by: sangwan.kwon --- tests/test-launcher.cpp | 8 ++++---- tests/test-util.hxx | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/test-launcher.cpp b/tests/test-launcher.cpp index aa5ea39..f36fae8 100644 --- a/tests/test-launcher.cpp +++ b/tests/test-launcher.cpp @@ -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 diff --git a/tests/test-util.hxx b/tests/test-util.hxx index 370e2c2..5f9ab1f 100644 --- a/tests/test-util.hxx +++ b/tests/test-util.hxx @@ -28,12 +28,12 @@ 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(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(end - start); \ + std::cout << "Elapsed time : " << mill.count() \ + << "ms" << std::endl; namespace test { namespace util { -- 2.34.1