diff options
author | William Blevins <wblevins001@gmail.com> | 2016-09-24 18:36:07 -0400 |
---|---|---|
committer | William Blevins <wblevins001@gmail.com> | 2016-09-24 18:36:07 -0400 |
commit | fd8260b1ea1ec158bcabc8030d3a47eadf7c1255 (patch) | |
tree | 636743a257afd12512616d2aab449ad06215dfd6 | |
parent | 113f84743fd140779ca30260a43ec038e1ee6cc4 (diff) | |
download | scons-fd8260b1ea1ec158bcabc8030d3a47eadf7c1255.tar.gz |
Moved fixture directory under #test.
-rwxr-xr-x | runtest.py | 2 | ||||
-rw-r--r-- | test/fixture/mylink.py (renamed from fixture/mylink.py) | 0 | ||||
-rw-r--r-- | test/fixture/sconstest.skip | 0 | ||||
-rw-r--r-- | test/fixture/wrapper.py (renamed from fixture/wrapper.py) | 0 |
4 files changed, 1 insertions, 1 deletions
@@ -789,7 +789,7 @@ def run_test(t, io_lock, async=True): fixture_dirs = [] if head: fixture_dirs.append(head) - fixture_dirs.append(os.path.join(scriptpath, 'fixture')) + fixture_dirs.append(os.path.join(scriptpath, 'test', 'fixture')) os.environ['FIXTURE_DIRS'] = ':'.join(fixture_dirs) test_start_time = time_func() diff --git a/fixture/mylink.py b/test/fixture/mylink.py index 7c03f007..7c03f007 100644 --- a/fixture/mylink.py +++ b/test/fixture/mylink.py diff --git a/test/fixture/sconstest.skip b/test/fixture/sconstest.skip new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/test/fixture/sconstest.skip diff --git a/fixture/wrapper.py b/test/fixture/wrapper.py index f02ea03d..f02ea03d 100644 --- a/fixture/wrapper.py +++ b/test/fixture/wrapper.py |