diff options
| author | Mats Wichmann <mats@linux.com> | 2019-12-15 13:48:35 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-12-15 16:04:34 (GMT) |
| commit | ac61e3fead14db2d61ac449d458c04f4bba4053f (patch) | |
| tree | 88ad598e5fe69e9ffd1b5a6e4a77bd1b93229555 /test | |
| parent | e8415886126979bec0a76095ec724a51605b7a87 (diff) | |
| download | SCons-ac61e3fead14db2d61ac449d458c04f4bba4053f.zip SCons-ac61e3fead14db2d61ac449d458c04f4bba4053f.tar.gz SCons-ac61e3fead14db2d61ac449d458c04f4bba4053f.tar.bz2 | |
Remove deprecated BuildDir, build_dir
Updates docs and code; moves tests to test/Removed/BuildDir/Old.
New tests verify that these can no longer be used.
Along the way a small cleanup in SConscript.py
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Removed/BuildDir/Old/BuildDir.py (renamed from test/Deprecated/BuildDir.py) | 0 | ||||
| -rw-r--r-- | test/Removed/BuildDir/Old/SConscript-build_dir.py (renamed from test/Deprecated/SConscript-build_dir.py) | 0 | ||||
| -rw-r--r-- | test/Removed/BuildDir/README.md | 6 | ||||
| -rw-r--r-- | test/Removed/BuildDir/SConstruct.global | 1 | ||||
| -rw-r--r-- | test/Removed/BuildDir/SConstruct.kwarg | 1 | ||||
| -rw-r--r-- | test/Removed/BuildDir/SConstruct.method | 3 |
6 files changed, 11 insertions, 0 deletions
diff --git a/test/Deprecated/BuildDir.py b/test/Removed/BuildDir/Old/BuildDir.py index 1a1ba02..1a1ba02 100644 --- a/test/Deprecated/BuildDir.py +++ b/test/Removed/BuildDir/Old/BuildDir.py diff --git a/test/Deprecated/SConscript-build_dir.py b/test/Removed/BuildDir/Old/SConscript-build_dir.py index 0d1ba6a..0d1ba6a 100644 --- a/test/Deprecated/SConscript-build_dir.py +++ b/test/Removed/BuildDir/Old/SConscript-build_dir.py diff --git a/test/Removed/BuildDir/README.md b/test/Removed/BuildDir/README.md new file mode 100644 index 0000000..c4fd879 --- /dev/null +++ b/test/Removed/BuildDir/README.md @@ -0,0 +1,6 @@ +BuildDir/Old contains old tests which used the now removed BuildDir +function, env.BuildDir method, and build_dir argument to SConscript, +preserved here for reference; the presence of an scontest.skip file +means they are never executed. + +The "new" tests verify failure using these symbols. diff --git a/test/Removed/BuildDir/SConstruct.global b/test/Removed/BuildDir/SConstruct.global new file mode 100644 index 0000000..086fbae --- /dev/null +++ b/test/Removed/BuildDir/SConstruct.global @@ -0,0 +1 @@ +BuildDir('build', 'src') diff --git a/test/Removed/BuildDir/SConstruct.kwarg b/test/Removed/BuildDir/SConstruct.kwarg new file mode 100644 index 0000000..a5c46fb --- /dev/null +++ b/test/Removed/BuildDir/SConstruct.kwarg @@ -0,0 +1 @@ +SConscript('src/SConscript', build_dir='build') diff --git a/test/Removed/BuildDir/SConstruct.method b/test/Removed/BuildDir/SConstruct.method new file mode 100644 index 0000000..afea459 --- /dev/null +++ b/test/Removed/BuildDir/SConstruct.method @@ -0,0 +1,3 @@ +env = Environment(BUILD='build', SRC='src') + +env.BuildDir('build', 'src') |