From 6dd3fd8b838d18d65edd6e7adabf3a363437f8a9 Mon Sep 17 00:00:00 2001
From: William Blevins <wblevins001@gmail.com>
Date: Sat, 24 Sep 2016 18:36:07 -0400
Subject: Moved fixture directory under #test.

---
 fixture/mylink.py           | 31 -------------------------------
 fixture/wrapper.py          |  6 ------
 runtest.py                  |  2 +-
 test/fixture/mylink.py      | 31 +++++++++++++++++++++++++++++++
 test/fixture/sconstest.skip |  0
 test/fixture/wrapper.py     |  6 ++++++
 6 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 fixture/mylink.py
 delete mode 100644 fixture/wrapper.py
 create mode 100644 test/fixture/mylink.py
 create mode 100644 test/fixture/sconstest.skip
 create mode 100644 test/fixture/wrapper.py

diff --git a/fixture/mylink.py b/fixture/mylink.py
deleted file mode 100644
index 7c03f00..0000000
--- a/fixture/mylink.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import sys
-
-if sys.platform == 'win32':
-    args = sys.argv[1:]
-    while args:
-        a = args[0]
-        if a == '-o':
-            out = args[1]
-            args = args[2:]
-            continue
-        if not a[0] in '/-':
-            break
-        args = args[1:]
-        if a[:5].lower() == '/out:': out = a[5:]
-    infile = open(args[0], 'rb')
-    outfile = open(out, 'wb')
-    for l in infile.readlines():
-        if l[:5] != b'#link':
-            outfile.write(l)
-    sys.exit(0)
-else:
-    import getopt
-    opts, args = getopt.getopt(sys.argv[1:], 'o:')
-    for opt, arg in opts:
-        if opt == '-o': out = arg
-    infile = open(args[0], 'rb')
-    outfile = open(out, 'wb')
-    for l in infile.readlines():
-        if l[:5] != b'#link':
-            outfile.write(l)
-    sys.exit(0)
diff --git a/fixture/wrapper.py b/fixture/wrapper.py
deleted file mode 100644
index f02ea03..0000000
--- a/fixture/wrapper.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import os
-import sys
-if '--version' not in sys.argv and '-dumpversion' not in sys.argv:
-    path = os.path.join(os.path.dirname(os.path.relpath(__file__)), 'wrapper.out')
-    open(path, 'wb').write(b"wrapper.py\n")
-os.system(" ".join(sys.argv[1:]))
diff --git a/runtest.py b/runtest.py
index c856740..d636b73 100755
--- a/runtest.py
+++ b/runtest.py
@@ -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/test/fixture/mylink.py b/test/fixture/mylink.py
new file mode 100644
index 0000000..7c03f00
--- /dev/null
+++ b/test/fixture/mylink.py
@@ -0,0 +1,31 @@
+import sys
+
+if sys.platform == 'win32':
+    args = sys.argv[1:]
+    while args:
+        a = args[0]
+        if a == '-o':
+            out = args[1]
+            args = args[2:]
+            continue
+        if not a[0] in '/-':
+            break
+        args = args[1:]
+        if a[:5].lower() == '/out:': out = a[5:]
+    infile = open(args[0], 'rb')
+    outfile = open(out, 'wb')
+    for l in infile.readlines():
+        if l[:5] != b'#link':
+            outfile.write(l)
+    sys.exit(0)
+else:
+    import getopt
+    opts, args = getopt.getopt(sys.argv[1:], 'o:')
+    for opt, arg in opts:
+        if opt == '-o': out = arg
+    infile = open(args[0], 'rb')
+    outfile = open(out, 'wb')
+    for l in infile.readlines():
+        if l[:5] != b'#link':
+            outfile.write(l)
+    sys.exit(0)
diff --git a/test/fixture/sconstest.skip b/test/fixture/sconstest.skip
new file mode 100644
index 0000000..e69de29
diff --git a/test/fixture/wrapper.py b/test/fixture/wrapper.py
new file mode 100644
index 0000000..f02ea03
--- /dev/null
+++ b/test/fixture/wrapper.py
@@ -0,0 +1,6 @@
+import os
+import sys
+if '--version' not in sys.argv and '-dumpversion' not in sys.argv:
+    path = os.path.join(os.path.dirname(os.path.relpath(__file__)), 'wrapper.out')
+    open(path, 'wb').write(b"wrapper.py\n")
+os.system(" ".join(sys.argv[1:]))
-- 
cgit v0.12