projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More logging and make it go to the right place.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index a64f4d295e6686d4da7f7b40c28b09db2905cb06..75cee85b325e5e4d2b452463af3ca21231edd67f 100644
(file)
--- 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 "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>
#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];
}
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 (
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
@@
-171,7
+172,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
p += sub_image->stride()[0];
}
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 (
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 (
shared_ptr<PlayerVideo> raw_pvf (
new PlayerVideo (