[Scummvm-git-logs] scummvm master -> 67d793433e51482af19149b584a9da7ba2fffb52

[orgads]

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

Summary:
fc57fab6d6 TESTS: Fix python warnings
67d793433e TESTS: Avoid needless copy if encoding.dat


Commit: fc57fab6d6d52a668f74fff221d53a4d5655494e
    https://github.com/scummvm/scummvm/commit/fc57fab6d6d52a668f74fff221d53a4d5655494e
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-04-15T22:53:22+03:00

Commit Message:
TESTS: Fix python warnings

Changed paths:
    test/cxxtest/cxxtestgen.py


diff --git a/test/cxxtest/cxxtestgen.py b/test/cxxtest/cxxtestgen.py
index 46267ac3e3..5414f830da 100755
--- a/test/cxxtest/cxxtestgen.py
+++ b/test/cxxtest/cxxtestgen.py
@@ -147,7 +147,7 @@ def printVersion():
 def setFiles( patterns ):
     '''Set input files specified on command line'''
     files = expandWildcards( patterns )
-    if len(files) is 0 and not root:
+    if len(files) == 0 and not root:
         usage( "No input files found" )
     return files
 
@@ -169,7 +169,7 @@ def scanInputFiles(files):
     for file in files:
         scanInputFile(file)
     global suites
-    if len(suites) is 0 and not root:
+    if len(suites) == 0 and not root:
         abort( 'No tests defined' )
 
 def scanInputFile(fileName):
@@ -328,7 +328,7 @@ def closeSuite():
     '''Close current suite and add it to the list if valid'''
     global suite
     if suite is not None:
-        if len(suite['tests']) is not 0:
+        if len(suite['tests']) != 0:
             verifySuite(suite)
             rememberSuite(suite)
         suite = None


Commit: 67d793433e51482af19149b584a9da7ba2fffb52
    https://github.com/scummvm/scummvm/commit/67d793433e51482af19149b584a9da7ba2fffb52
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-04-15T22:53:22+03:00

Commit Message:
TESTS: Avoid needless copy if encoding.dat

Changed paths:
    test/module.mk


diff --git a/test/module.mk b/test/module.mk
index db5bad8461..10af3a0a99 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -77,8 +77,10 @@ clean-test:
 	-$(RM) test/runner.cpp test/runner test/engine-data/encoding.dat
 	-rmdir test/engine-data
 
-copy-dat:
+test/engine-data/encoding.dat: $(srcdir)/dists/engine-data/encoding.dat
 	$(MKDIR) test/engine-data
 	$(CP) $(srcdir)/dists/engine-data/encoding.dat test/engine-data/encoding.dat
 
+copy-dat: test/engine-data/encoding.dat
+
 .PHONY: test clean-test copy-dat