Merge branch 'feature/upstream' into develop

1 files changed, 10 insertions, 10 deletions

diff --git a/src/engine/SCons/Scanner/CTests.py b/src/engine/SCons/Scanner/CTests.py
index f7b2b16..d39f206 100644
--- a/src/engine/SCons/Scanner/CTests.py
+++ b/src/engine/SCons/Scanner/CTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001 - 2017 The SCons Foundation
+# Copyright (c) 2001 - 2019 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Scanner/CTests.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
+__revision__ = "src/engine/SCons/Scanner/CTests.py 103260fce95bf5db1c35fb2371983087d85dd611 2019-07-13 18:25:30 bdbaddog"
 
 import SCons.compat
 
@@ -48,7 +48,7 @@ test.write('f1.cpp',"""
 #include \"f1.h\"
 #include <f2.h>
 
-int main()
+int main(void)
 {
    return 0;
 }
@@ -60,7 +60,7 @@ test.write('f2.cpp',"""
 #include \"f1.h\"
 #import <f4.h>
 
-int main()
+int main(void)
 {
    return 0;
 }
@@ -79,7 +79,7 @@ test.write('f3.cpp',"""
 
 const char* x = "#include <never.h>"
 
-int main()
+int main(void)
 {
    return 0;
 }
@@ -113,7 +113,7 @@ test.write('fa.cpp',"""
 #include \"fa.h\"
 #include <fb.h>
 
-int main()
+int main(void)
 {
    return 0;
 }
@@ -135,7 +135,7 @@ test.write(['work', 'src', 'fff.c'], """
 #include <iii.h>
 #include <jjj.h>
 
-int main()
+int main(void)
 {
     return 0;
 }
@@ -144,7 +144,7 @@ int main()
 test.write([ 'work', 'src', 'aaa.c'], """
 #include "bbb.h"
 
-int main()
+int main(void)
 {
    return 0;
 }
@@ -155,7 +155,7 @@ test.write([ 'work', 'src', 'bbb.h'], "\n")
 test.write([ 'repository', 'src', 'ccc.c'], """
 #include "ddd.h"
 
-int main()
+int main(void)
 {
    return 0;
 }
@@ -218,7 +218,7 @@ def deps_match(self, deps, headers):
     global my_normpath
     scanned = list(map(my_normpath, list(map(str, deps))))
     expect = list(map(my_normpath, headers))
-    self.failUnless(scanned == expect, "expect %s != scanned %s" % (expect, scanned))
+    self.assertTrue(scanned == expect, "expect %s != scanned %s" % (expect, scanned))
 
 # define some tests: