[Scummvm-git-logs] scummvm master -> f5ffbe115532f49b155ed8e7a71e7eaac9c6f87b

[phcoder]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f5ffbe1155 TEST: Copy encoding.dat to make tests work in relative build directory


Commit: f5ffbe115532f49b155ed8e7a71e7eaac9c6f87b
    https://github.com/scummvm/scummvm/commit/f5ffbe115532f49b155ed8e7a71e7eaac9c6f87b
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-11-16T02:38:22+01:00

Commit Message:
TEST: Copy encoding.dat to make tests work in relative build directory

Changed paths:
    backends/platform/null/null.cpp
    test/module.mk


diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index a89bbea205..9bfc4c8e54 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -226,7 +226,7 @@ void OSystem_NULL::logMessage(LogMessageType::Type type, const char *message) {
 }
 
 void OSystem_NULL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
-	s.add("dists/engine-data", new Common::FSDirectory("dists/engine-data", 4), priority);
+	s.add("test/engine-data", new Common::FSDirectory("test/engine-data", 4), priority);
 	s.add("gui/themes", new Common::FSDirectory("gui/themes", 4), priority);
 }
 
diff --git a/test/module.mk b/test/module.mk
index c126730687..3621755254 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -72,7 +72,7 @@ test: test/runner
 	./test/runner
 test/runner: test/runner.cpp $(TEST_LIBS)
 	$(QUIET_CXX)$(CXX) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ $+ $(TEST_LDFLAGS)
-test/runner.cpp: $(TESTS)
+test/runner.cpp: $(TESTS) copy-dat
 	@mkdir -p test
 	$(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+
 
@@ -80,4 +80,8 @@ clean: clean-test
 clean-test:
 	-$(RM) test/runner.cpp test/runner
 
-.PHONY: test clean-test
+copy-dat:
+	-$(MKDIR) test/engine-data
+	-$(CP) $(srcdir)/dists/engine-data/encoding.dat test/engine-data
+
+.PHONY: test clean-test copy-dat