Commit 3e66ea8f authored by Jan Kiene's avatar Jan Kiene
Browse files

allow passing the tests in scheduled sanitizer run

parent 4f680de2

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -425,11 +425,11 @@ sanitizer-test-on-main-scheduled: 
  stage: test

  rules:

    # only run in scheduled pipeline that passes this env var

    - if: $SANITIZER_TEST_IN_FMT && $SANITIZER_TEST_OUT_FMTS

    - if: $SANITIZER_TEST_IN_FMT && $SANITIZER_TEST_OUT_FMTS && SANITIZER_TEST_TESTS

  script:

    - *print-common-info

    - echo "Running scheduled sanitizer"

    - python3 ci/run_scheduled_sanitizer_test.py $SANITIZER_TEST_IN_FMT $SANITIZER_TEST_OUT_FMTS

    - python3 ci/run_scheduled_sanitizer_test.py $SANITIZER_TEST_IN_FMT $SANITIZER_TEST_OUT_FMTS $SANITIZER_TEST_TESTS





# ---------------------------------------------------------------

ci/run_scheduled_sanitizer_test.py

+5 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import pathlib 


DURATION = "120"

CFG = "ci_linux.json"

TESTS = [ "CLANG1", "CLANG2" ]

SUPPORTED_TESTS = [ "CLANG1", "CLANG2", "CLANG3", "VALGRIND" ]

EP_FILE = "ep_015.g192"



SCRIPT_DIR = pathlib.Path("./scripts").resolve()
@@ -16,9 +16,10 @@ SCRIPT_DIR = pathlib.Path("./scripts").resolve() 
def main(args):

	in_format = args.in_format

	out_formats = args.out_formats

	tests = args.tests



	modes = get_modes(in_format)

	returncode = run_check(modes, out_formats)

	returncode = run_check(modes, out_formats, tests)



	sys.exit(returncode)
@@ -31,7 +32,7 @@ def get_modes(in_format: str) -> list: 
	return [m for m in output.splitlines() if in_format in m]





def run_check(modes: list, out_formats: list):

def run_check(modes: list, out_formats: list, tests: list):

	cmd = [

		SCRIPT_DIR.joinpath("IvasBuildAndRunChecks.py"),

		"-U",
@@ -65,5 +66,6 @@ if __name__ == "__main__": 
	parser = argparse.ArgumentParser()

	parser.add_argument("in_format", type=str)

	parser.add_argument("out_formats", type=str, nargs="+")

	parser.add_argument("tests", type=str, nargs="+")



	sys.exit(main(parser.parse_args()))
 
 No newline at end of file