[Scummvm-git-logs] scummvm master -> 23111de32ed47c170ca1626fc6040537d87afead

[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:
23111de32e TEST: clean copied encoding.dat


Commit: 23111de32ed47c170ca1626fc6040537d87afead
    https://github.com/scummvm/scummvm/commit/23111de32ed47c170ca1626fc6040537d87afead
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-11-16T03:47:22+01:00

Commit Message:
TEST: clean copied encoding.dat

Changed paths:
    test/module.mk


diff --git a/test/module.mk b/test/module.mk
index 3621755254..34b7526be7 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -70,18 +70,19 @@ endif
 
 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) copy-dat
+test/runner: test/runner.cpp $(TEST_LIBS) copy-dat
+	$(QUIET_CXX)$(CXX) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ $(srcdir)/test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS)
+test/runner.cpp: $(TESTS)
 	@mkdir -p test
 	$(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+
 
 clean: clean-test
 clean-test:
-	-$(RM) test/runner.cpp test/runner
+	-$(RM) test/runner.cpp test/runner test/engine-data/encoding.dat
+	rmdir test/engine-data
 
 copy-dat:
 	-$(MKDIR) test/engine-data
-	-$(CP) $(srcdir)/dists/engine-data/encoding.dat test/engine-data
+	-$(CP) $(srcdir)/dists/engine-data/encoding.dat test/engine-data/encoding.dat
 
 .PHONY: test clean-test copy-dat