diff options
| author | Adam Gross <grossag@vmware.com> | 2020-04-07 14:05:47 (GMT) |
|---|---|---|
| committer | Adam Gross <grossag@vmware.com> | 2020-04-07 14:05:47 (GMT) |
| commit | 348f30c118b38a5c5684caeae16bfb3ff4c61cb1 (patch) | |
| tree | 38ede1fa444e37125801c35d5e13549bdd4b9ece | |
| parent | f575eba8904b850c211ceaa9538048e454751375 (diff) | |
| download | SCons-348f30c118b38a5c5684caeae16bfb3ff4c61cb1.zip SCons-348f30c118b38a5c5684caeae16bfb3ff4c61cb1.tar.gz SCons-348f30c118b38a5c5684caeae16bfb3ff4c61cb1.tar.bz2 | |
Address review feedback
| -rw-r--r-- | test/Dir/DriveAbsPath.py | 11 | ||||
| -rw-r--r-- | test/Dir/DriveAbsPath/SConstruct | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/test/Dir/DriveAbsPath.py b/test/Dir/DriveAbsPath.py index 033ac73..829cef2 100644 --- a/test/Dir/DriveAbsPath.py +++ b/test/Dir/DriveAbsPath.py @@ -25,7 +25,11 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ -Test to confirm that Dir(drive_path).abspath works on Windows. +Test to confirm that Dir(drive_path).abspath works on Windows. This verifies +that SCons no longer has an issue with Dir('T:').abspath returning 'T:\T:'. +Instead, it verifies that Dir('T:') correctly returns an instance of the +RootDir class and that class has abspath and path accessors that work +correctly. """ import TestSCons @@ -36,8 +40,9 @@ test = TestSCons.TestSCons() if IS_WINDOWS: test.dir_fixture('DriveAbsPath') test.run() - -test.pass_test() + test.pass_test() +else: + test.skip_test('Skipping Windows-only test.') # Local Variables: # tab-width:4 diff --git a/test/Dir/DriveAbsPath/SConstruct b/test/Dir/DriveAbsPath/SConstruct index af19277..5b63193 100644 --- a/test/Dir/DriveAbsPath/SConstruct +++ b/test/Dir/DriveAbsPath/SConstruct @@ -6,7 +6,7 @@ drive = os.path.splitdrive(os.getcwd())[0] drive_dir = env.fs.Dir(drive) if not isinstance(drive_dir, SCons.Node.FS.RootDir): - raise Exception('env.fs.Dir("%s") returned a %s instance of a RootDir' % + raise Exception('env.fs.Dir("%s") returned a %s instead of a RootDir' % (drive, type(drive_dir))) drive_abspath1 = drive_dir._abspath |