forked from CxxTest/cxxtest
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
191addd
commit 4070d2a
Showing
35 changed files
with
447 additions
and
447 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ | |
# Maintainer: Gašper Ažman <[email protected]> | ||
# | ||
# This file is maintained as a part of the CxxTest test suite. | ||
# | ||
# | ||
# == About == | ||
# | ||
# This builder correctly tracks dependencies and supports just about every | ||
|
@@ -155,14 +155,14 @@ def UnitTest(env, target, source = [], **kwargs): | |
|
||
def isValidScriptPath(cxxtestgen): | ||
"""check keyword arg or environment variable locating cxxtestgen script""" | ||
|
||
if cxxtestgen and os.path.exists(cxxtestgen): | ||
return True | ||
else: | ||
SCons.Warnings.warn(ToolCxxTestWarning, | ||
"Invalid CXXTEST environment variable specified!") | ||
return False | ||
|
||
def defaultCxxTestGenLocation(env): | ||
return os.path.join( | ||
envget(env, 'CXXTEST_CXXTESTGEN_DEFAULT_LOCATION'), | ||
|
@@ -171,7 +171,7 @@ def defaultCxxTestGenLocation(env): | |
|
||
def findCxxTestGen(env): | ||
"""locate the cxxtestgen script by checking environment, path and project""" | ||
|
||
# check the SCons environment... | ||
# Then, check the OS environment... | ||
cxxtest = envget(env, 'CXXTEST', None) | ||
|
@@ -201,18 +201,18 @@ def findCxxTestGen(env): | |
# make sure it was correct | ||
if isValidScriptPath(cxxtest): | ||
return os.path.realpath(cxxtest) | ||
|
||
# No valid environment variable found, so... | ||
# Next, check the path... | ||
# Next, check the project | ||
check_path = os.path.join( | ||
envget(env, 'CXXTEST_INSTALL_DIR'), | ||
envget(env, 'CXXTEST_CXXTESTGEN_DEFAULT_LOCATION')) | ||
|
||
cxxtest = (env.WhereIs(envget(env, 'CXXTEST_CXXTESTGEN_SCRIPT_NAME')) or | ||
cxxtest = (env.WhereIs(envget(env, 'CXXTEST_CXXTESTGEN_SCRIPT_NAME')) or | ||
env.WhereIs(envget(env, 'CXXTEST_CXXTESTGEN_SCRIPT_NAME'), | ||
path=[Dir(check_path).abspath])) | ||
|
||
if cxxtest: | ||
return cxxtest | ||
else: | ||
|
@@ -286,7 +286,7 @@ def generate(env, **kwargs): | |
# | ||
# Expected behaviour: keyword arguments override environment variables; | ||
# environment variables override default settings. | ||
# | ||
# | ||
env.SetDefault( CXXTEST_RUNNER = 'ErrorPrinter' ) | ||
env.SetDefault( CXXTEST_OPTS = '' ) | ||
env.SetDefault( CXXTEST_SUFFIX = '.t.h' ) | ||
|
@@ -316,7 +316,7 @@ def generate(env, **kwargs): | |
|
||
# find and add the CxxTest headers to the path. | ||
env.AppendUnique( CXXTEST_CPPPATH = findCxxTestHeaders(env) ) | ||
|
||
cxxtest = env['CXXTEST'] | ||
if cxxtest: | ||
# | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.