diff --git a/scripts/expr_parser.py b/scripts/sanity_chk/expr_parser.py similarity index 100% rename from scripts/expr_parser.py rename to scripts/sanity_chk/expr_parser.py diff --git a/scripts/ini2yaml.py b/scripts/sanity_chk/ini2yaml.py similarity index 100% rename from scripts/ini2yaml.py rename to scripts/sanity_chk/ini2yaml.py diff --git a/scripts/sanitycheck-platform-schema.yaml b/scripts/sanity_chk/sanitycheck-platform-schema.yaml similarity index 100% rename from scripts/sanitycheck-platform-schema.yaml rename to scripts/sanity_chk/sanitycheck-platform-schema.yaml diff --git a/scripts/sanitycheck-tc-schema.yaml b/scripts/sanity_chk/sanitycheck-tc-schema.yaml similarity index 100% rename from scripts/sanitycheck-tc-schema.yaml rename to scripts/sanity_chk/sanitycheck-tc-schema.yaml diff --git a/scripts/scl.py b/scripts/sanity_chk/scl.py similarity index 100% rename from scripts/scl.py rename to scripts/sanity_chk/scl.py diff --git a/scripts/sanitycheck b/scripts/sanitycheck index f6bf875bf9c..7d20e2770f6 100755 --- a/scripts/sanitycheck +++ b/scripts/sanitycheck @@ -185,11 +185,11 @@ if "ZEPHYR_BASE" not in os.environ: exit(1) ZEPHYR_BASE = os.environ["ZEPHYR_BASE"] -import scl +from sanity_chk import scl sys.path.insert(0, os.path.join(ZEPHYR_BASE, "scripts/")) -import expr_parser +from sanity_chk import expr_parser VERBOSE = 0 LAST_SANITY = os.path.join(ZEPHYR_BASE, "scripts", "sanity_chk", @@ -1064,7 +1064,7 @@ class Platform: yaml_platform_schema = scl.yaml_load( os.path.join(os.environ['ZEPHYR_BASE'], - "scripts", "sanitycheck-platform-schema.yaml")) + "scripts", "sanity_chk", "sanitycheck-platform-schema.yaml")) def __init__(self, cfile): """Constructor. @@ -1231,7 +1231,7 @@ class TestSuite: yaml_tc_schema = scl.yaml_load( os.path.join(os.environ['ZEPHYR_BASE'], - "scripts", "sanitycheck-tc-schema.yaml")) + "scripts", "sanity_chk", "sanitycheck-tc-schema.yaml")) def __init__(self, arch_root, testcase_roots, outdir, coverage): # Keep track of which test cases we've filtered out and why