diff options
| -rw-r--r-- | src/engine/SCons/Node/__init__.py | 14 | ||||
| -rw-r--r-- | test/Scanner/CrossLanguageNoExtension.py (renamed from test/Scanner/ScannerHint.py) | 21 |
2 files changed, 7 insertions, 28 deletions
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index d709f11..5aa9600 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -962,19 +962,7 @@ class Node(object): if not scanner: # no scanner could be found for the given node's scanner key; # thus, make an attempt at using a default. - - # check for a user specified scanner hint - scanner = env.get( 'SCANNER_HINT' ) - - if scanner: - # Ensure scanner hint returned a valid Scanner object - if not isinstance( scanner, SCons.Scanner.Base ): - raise SCons.Errors.UserError( - 'SCANNER_HINT object must be instance of ' + str(SCons.Scanner.Base) - ) - else: - # no scanner hint, so do best guess (IE. return the root's scanner). - scanner = root_node_scanner + scanner = root_node_scanner return scanner diff --git a/test/Scanner/ScannerHint.py b/test/Scanner/CrossLanguageNoExtension.py index b12b847..5bf205f 100644 --- a/test/Scanner/ScannerHint.py +++ b/test/Scanner/CrossLanguageNoExtension.py @@ -63,17 +63,18 @@ k2scan = Scanner(name = 'k2', argument = None, skeys = ['.k2']) +k2scan2 = Scanner(name = 'k2', + function = k2file_scan, + argument = None, + skeys = ['']) + env1 = Environment() env1.Append(SCANNERS = [ kscan, k2scan ] ) env1.Command( 'k', 'foo.k', Copy( '$TARGET', '$SOURCE' ) ) env2 = env1.Clone() -env2.Replace(SCANNER_HINT = k2scan) +env2.Append(SCANNERS = [ k2scan2 ] ) env2.Command( 'k2', 'foo.k', Copy( '$TARGET', '$SOURCE' ) ) - -env3 = env1.Clone() -env3.Replace(SCANNER_HINT = 'raise') -env3.Command( 'raise', 'foo.k', Copy( '$TARGET', '$SOURCE' ) ) """) test.write('foo.k', @@ -100,16 +101,6 @@ Copy("k2", "foo.k") test.run(arguments='k k2', stdout=expected_stdout) -expected_stdout = test.wrap_stdout("""\ -kscan: foo.k -kscan: xxx.k -""", error = True) - -expected_stderr = """\ -scons: *** [raise] SCANNER_HINT object must be instance of <class 'SCons.Scanner.Base'> -""" - -test.run(arguments='raise', stderr=expected_stderr, stdout=expected_stdout, status = 2) test.pass_test() # Local Variables: |