From b527c93ebbb5b3e83b2f0882cf62d6072d8b4cb5 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Fri, 11 Nov 2016 01:19:20 -0500 Subject: The percent signs are causing syntax error on windows, switched to more compatible code --- test/MSVS/vs-10.0Exp-exec.py | 3 ++- test/MSVS/vs-11.0-exec.py | 3 ++- test/MSVS/vs-11.0Exp-exec.py | 3 ++- test/MSVS/vs-14.0-exec.py | 3 ++- test/MSVS/vs-14.0Exp-exec.py | 3 ++- test/MSVS/vs-6.0-exec.py | 3 ++- test/MSVS/vs-7.0-exec.py | 3 ++- test/MSVS/vs-7.1-exec.py | 3 ++- test/MSVS/vs-8.0Exp-exec.py | 3 ++- test/MSVS/vs-9.0-exec.py | 3 ++- test/MSVS/vs-9.0Exp-exec.py | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/test/MSVS/vs-10.0Exp-exec.py b/test/MSVS/vs-10.0Exp-exec.py index 39c96ac..a63f6c4 100644 --- a/test/MSVS/vs-10.0Exp-exec.py +++ b/test/MSVS/vs-10.0Exp-exec.py @@ -55,7 +55,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-11.0-exec.py b/test/MSVS/vs-11.0-exec.py index 7acf9d5..21645f5 100644 --- a/test/MSVS/vs-11.0-exec.py +++ b/test/MSVS/vs-11.0-exec.py @@ -55,7 +55,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-11.0Exp-exec.py b/test/MSVS/vs-11.0Exp-exec.py index 7cfc85d..be48971 100644 --- a/test/MSVS/vs-11.0Exp-exec.py +++ b/test/MSVS/vs-11.0Exp-exec.py @@ -55,7 +55,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-14.0-exec.py b/test/MSVS/vs-14.0-exec.py index b96bdab..911c4ac 100644 --- a/test/MSVS/vs-14.0-exec.py +++ b/test/MSVS/vs-14.0-exec.py @@ -55,7 +55,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-14.0Exp-exec.py b/test/MSVS/vs-14.0Exp-exec.py index 44ebece..cb4aaf3 100644 --- a/test/MSVS/vs-14.0Exp-exec.py +++ b/test/MSVS/vs-14.0Exp-exec.py @@ -55,7 +55,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-6.0-exec.py b/test/MSVS/vs-6.0-exec.py index fe08a77..d017790 100644 --- a/test/MSVS/vs-6.0-exec.py +++ b/test/MSVS/vs-6.0-exec.py @@ -54,7 +54,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-7.0-exec.py b/test/MSVS/vs-7.0-exec.py index cc141f3..e62ee77 100644 --- a/test/MSVS/vs-7.0-exec.py +++ b/test/MSVS/vs-7.0-exec.py @@ -54,7 +54,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-7.1-exec.py b/test/MSVS/vs-7.1-exec.py index f44af80..42f6ae8 100644 --- a/test/MSVS/vs-7.1-exec.py +++ b/test/MSVS/vs-7.1-exec.py @@ -54,7 +54,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-8.0Exp-exec.py b/test/MSVS/vs-8.0Exp-exec.py index 5132d6d..66196f1 100644 --- a/test/MSVS/vs-8.0Exp-exec.py +++ b/test/MSVS/vs-8.0Exp-exec.py @@ -55,7 +55,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-9.0-exec.py b/test/MSVS/vs-9.0-exec.py index ebd08c0..7b544aa 100644 --- a/test/MSVS/vs-9.0-exec.py +++ b/test/MSVS/vs-9.0-exec.py @@ -55,7 +55,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) diff --git a/test/MSVS/vs-9.0Exp-exec.py b/test/MSVS/vs-9.0Exp-exec.py index c4a562a..caa763e 100644 --- a/test/MSVS/vs-9.0Exp-exec.py +++ b/test/MSVS/vs-9.0Exp-exec.py @@ -55,7 +55,8 @@ if not msvs_version in test.msvs_versions(): test.run(arguments = '-n -q -Q -f -', stdin = """\ env = Environment(tools = ['msvc'], MSVS_VERSION='%(msvs_version)s') -print "os.environ.update(%%s)" %% repr(env['ENV']) +sconsEnv = repr(env['ENV']) +print("os.environ.update(" + sconsEnv + ")") """ % locals()) exec(test.stdout()) -- cgit v0.12