From: Kefu Chai <kchai@redhat.com>
Date: Wed, 26 Dec 2018 04:58:08 +0000 (+0800)
Subject: test: write log file to current directory
X-Git-Tag: v12.2.12~115^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a4ea3847785af1a089fda4165b921bb66e1ce37;p=ceph.git

test: write log file to current directory

instead of writing log files to '/tmp', write them to current directory.

by default, ctest runs the tests in ${CMAKE_CURRENT_BINARY_DIR}, so, in
this case, the log files are located in build/src/test/. this ensure
that current user has enough previledge to remove the log files.

this also allows multiple instances of 'unittest_log' to run in parallel.

See-also: http://tracker.ceph.com/issues/36737
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a13a6f1d0b39a541896591cd04fc1980bb1acfee)

Conflicts:
	src/log/test.cc: trivial resolution
---

diff --git a/src/log/test.cc b/src/log/test.cc
index e11505af4561..9a433666052e 100644
--- a/src/log/test.cc
+++ b/src/log/test.cc
@@ -19,7 +19,7 @@ TEST(Log, Simple)
   Log log(&subs);
   log.start();
  
-  log.set_log_file("/tmp/foo");
+  log.set_log_file("foo");
   log.reopen_log_file();
 
   log.set_stderr_level(5, -1);
@@ -53,7 +53,7 @@ TEST(Log, ManyNoGather)
   subs.add(1, "foo", 1, 1);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
   for (int i=0; i<many; i++) {
     int l = 10;
@@ -71,7 +71,7 @@ TEST(Log, ManyGatherLog)
   subs.add(1, "foo", 20, 10);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
   for (int i=0; i<many; i++) {
     int l = 10;
@@ -89,7 +89,7 @@ TEST(Log, ManyGatherLogStringAssign)
   subs.add(1, "foo", 20, 10);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
   for (int i=0; i<many; i++) {
     int l = 10;
@@ -110,7 +110,7 @@ TEST(Log, ManyGatherLogStringAssignWithReserve)
   subs.add(1, "foo", 20, 10);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
   for (int i=0; i<many; i++) {
     int l = 10;
@@ -133,7 +133,7 @@ TEST(Log, ManyGatherLogPrebuf)
   subs.add(1, "foo", 20, 10);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
   for (int i=0; i<many; i++) {
     int l = 10;
@@ -156,7 +156,7 @@ TEST(Log, ManyGatherLogPrebufOverflow)
   subs.add(1, "foo", 20, 10);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
   for (int i=0; i<many; i++) {
     int l = 10;
@@ -180,7 +180,7 @@ TEST(Log, ManyGather)
   subs.add(1, "foo", 20, 1);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
   for (int i=0; i<many; i++) {
     int l = 10;
@@ -197,7 +197,7 @@ void do_segv()
   subs.add(1, "foo", 20, 1);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
 
   log.inject_segv();
@@ -222,7 +222,7 @@ TEST(Log, LargeLog)
   subs.add(1, "foo", 20, 10);
   Log log(&subs);
   log.start();
-  log.set_log_file("/tmp/big");
+  log.set_log_file("big");
   log.reopen_log_file();
   int l = 10;
   Entry *e = new Entry(ceph_clock_now(), pthread_self(), l, 1);