summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--QMTest/SConscript1
-rw-r--r--SConstruct24
-rw-r--r--src/test_strings.py1
3 files changed, 12 insertions, 14 deletions
diff --git a/QMTest/SConscript b/QMTest/SConscript
index 8e5585f..33fe903 100644
--- a/QMTest/SConscript
+++ b/QMTest/SConscript
@@ -39,7 +39,6 @@ files = [
'TestSCons.py',
'TestSConsign.py',
'TestSCons_time.py',
- 'unittest.py',
]
def copy(target, source, env):
diff --git a/SConstruct b/SConstruct
index 25f1ed4..2690311 100644
--- a/SConstruct
+++ b/SConstruct
@@ -879,8 +879,8 @@ for p in [ scons ]:
# Run setup.py in the unpacked subdirectory to "install" everything
# into our build/test subdirectory. The runtest.py script will set
# PYTHONPATH so that the tests only look under build/test-{package},
- # and under etc (for the testing modules TestCmd.py, TestSCons.py,
- # and unittest.py). This makes sure that our tests pass with what
+ # and under QMTest (for the testing modules TestCmd.py, TestSCons.py,
+ # etc.). This makes sure that our tests pass with what
# we really packaged, not because of something hanging around in
# the development directory.
#
@@ -946,8 +946,8 @@ for p in [ scons ]:
# Run setup.py in the unpacked subdirectory to "install" everything
# into our build/test subdirectory. The runtest.py script will set
# PYTHONPATH so that the tests only look under build/test-{package},
- # and under etc (for the testing modules TestCmd.py, TestSCons.py,
- # and unittest.py). This makes sure that our tests pass with what
+ # and under QMTest (for the testing modules TestCmd.py, TestSCons.py,
+ # etc.). This makes sure that our tests pass with what
# we really packaged, not because of something hanging around in
# the development directory.
#
@@ -1261,10 +1261,10 @@ if sfiles:
# Run setup.py in the unpacked subdirectory to "install" everything
# into our build/test subdirectory. The runtest.py script will set
# PYTHONPATH so that the tests only look under build/test-{package},
- # and under etc (for the testing modules TestCmd.py, TestSCons.py,
- # and unittest.py). This makes sure that our tests pass with what
- # we really packaged, not because of something hanging around in
- # the development directory.
+ # and under QMTest (for the testing modules TestCmd.py,
+ # TestSCons.py, etc.). This makes sure that our tests pass with
+ # what we really packaged, not because of something hanging around
+ # in the development directory.
#
# We can get away with calling setup.py using a directory path
# like this because we put a preamble in it that will chdir()
@@ -1315,10 +1315,10 @@ if sfiles:
# Run setup.py in the unpacked subdirectory to "install" everything
# into our build/test subdirectory. The runtest.py script will set
# PYTHONPATH so that the tests only look under build/test-{package},
- # and under etc (for the testing modules TestCmd.py, TestSCons.py,
- # and unittest.py). This makes sure that our tests pass with what
- # we really packaged, not because of something hanging around in
- # the development directory.
+ # and under QMTest (for the testing modules TestCmd.py,
+ # TestSCons.py, etc.). This makes sure that our tests pass with
+ # what we really packaged, not because of something hanging
+ # around in the development directory.
#
# We can get away with calling setup.py using a directory path
# like this because we put a preamble in it that will chdir()
diff --git a/src/test_strings.py b/src/test_strings.py
index 012efc9..0b39592 100644
--- a/src/test_strings.py
+++ b/src/test_strings.py
@@ -212,7 +212,6 @@ check_list = [
'QMTest/configuration',
'QMTest/TestCmd.py',
'QMTest/TestCommon.py',
- 'QMTest/unittest.py',
'src/os_spawnv_fix.diff',
'src/MANIFEST.in',
'src/setup.cfg',