X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.h;h=10113b66276afae11a42af1a2cb442bfe05aba0c;hb=1ff553f6752469b940b5c59e2a619e71736e7611;hp=863a015af0916e6076f190f996afbc51fa9bccb5;hpb=67544a255ffd7a27f5388e18cd0207f23ecce5ed;p=dcpomatic.git diff --git a/test/test.h b/test/test.h index 863a015af..10113b662 100644 --- a/test/test.h +++ b/test/test.h @@ -19,7 +19,6 @@ */ -#include "lib/warnings.h" #include "lib/types.h" #include #include @@ -56,7 +55,6 @@ private: extern bool wait_for_jobs (); -extern void setup_test_config (); extern std::shared_ptr new_test_film (std::string); extern std::shared_ptr new_test_film2 (std::string, std::vector> content = {}, Cleanup* cleanup = nullptr); extern void check_dcp (boost::filesystem::path, boost::filesystem::path); @@ -76,6 +74,9 @@ void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesys extern boost::filesystem::path subtitle_file (std::shared_ptr film); extern void make_random_file (boost::filesystem::path path, size_t size); extern void make_and_verify_dcp (std::shared_ptr film, std::vector ignore = {}); +extern void check_int_close (int a, int b, int d); +extern void check_int_close (std::pair, std::pair, int d); +extern boost::filesystem::path find_file (boost::filesystem::path dir, std::string filename_part); class LogSwitcher @@ -89,6 +90,13 @@ private: }; +class ConfigRestorer +{ +public: + ~ConfigRestorer(); +}; + + namespace dcp { std::ostream& operator<< (std::ostream& s, dcp::Size i);