mirror of
https://github.com/github/codeql.git
synced 2025-12-17 01:03:14 +01:00
Support CODEQL_PATH_TRANSFORMER env var in python path renamer
The new name is required by overlay support.
This commit is contained in:
@@ -25,7 +25,7 @@ def renamer_from_options_and_env(options, logger):
|
|||||||
except (AttributeError, ImportError):
|
except (AttributeError, ImportError):
|
||||||
raise SemmleError("Cannot get renamer from module " + options.renamer)
|
raise SemmleError("Cannot get renamer from module " + options.renamer)
|
||||||
else:
|
else:
|
||||||
path_transformer = os.environ.get("SEMMLE_PATH_TRANSFORMER", None)
|
path_transformer = os.environ.get("CODEQL_PATH_TRANSFORMER", None) or os.environ.get("SEMMLE_PATH_TRANSFORMER", None)
|
||||||
if path_transformer:
|
if path_transformer:
|
||||||
logger.info("Using path transformer '%s'", path_transformer)
|
logger.info("Using path transformer '%s'", path_transformer)
|
||||||
rename = projectlayout.get_renamer(path_transformer)
|
rename = projectlayout.get_renamer(path_transformer)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ class ProjectLayoutUseTest(ExtractorTest):
|
|||||||
|
|
||||||
def test_invalid_layout(self):
|
def test_invalid_layout(self):
|
||||||
try:
|
try:
|
||||||
with environment("SEMMLE_PATH_TRANSFORMER", "nonsuch/project-layout"):
|
with environment("CODEQL_PATH_TRANSFORMER", "nonsuch/project-layout"):
|
||||||
self.run_extractor("-R", self.src_path)
|
self.run_extractor("-R", self.src_path)
|
||||||
except subprocess.CalledProcessError as ex:
|
except subprocess.CalledProcessError as ex:
|
||||||
self.assertEqual(ex.returncode, 2)
|
self.assertEqual(ex.returncode, 2)
|
||||||
|
|||||||
Reference in New Issue
Block a user