summaryrefslogtreecommitdiff
path: root/test/client_server_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-05-19 01:39:47 +0200
committerCarl Hetherington <cth@carlh.net>2020-05-20 21:56:28 +0200
commit6eec3fea764f2fe35723089d60c51005616905bf (patch)
tree7ce1f10890f7ae7db537dab8e26fcb1482cfb87f /test/client_server_test.cc
parentc3983e1ced75c2205fb1c172e2ff4fa44fb569bb (diff)
More logging and make it go to the right place.
Diffstat (limited to 'test/client_server_test.cc')
-rw-r--r--test/client_server_test.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index a64f4d295..75cee85b3 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -37,6 +37,7 @@
#include "lib/encode_server_description.h"
#include "lib/file_log.h"
#include "lib/dcpomatic_log.h"
+#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/thread.hpp>
@@ -85,7 +86,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
p += sub_image->stride()[0];
}
- dcpomatic_log.reset (new FileLog("build/test/client_server_test_rgb.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_rgb.log")));
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
@@ -171,7 +172,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
p += sub_image->stride()[0];
}
- dcpomatic_log.reset (new FileLog("build/test/client_server_test_yuv.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_yuv.log")));
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
@@ -244,7 +245,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
}
}
- dcpomatic_log.reset (new FileLog("build/test/client_server_test_j2k.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_j2k.log")));
shared_ptr<PlayerVideo> raw_pvf (
new PlayerVideo (