From aa26ca3d8fdbaf4a208969e9d420e17757d3630a Mon Sep 17 00:00:00 2001 From: Andras Varga Date: Fri, 11 Oct 2024 21:42:43 +0200 Subject: [PATCH] tests adjusted to --build-modes --- tests/project_tester | 8 ++++---- tests/smoketest_install_and_run | 8 ++++---- tests/smoketest_nixless | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/project_tester b/tests/project_tester index f7cfb0ed..10482090 100755 --- a/tests/project_tester +++ b/tests/project_tester @@ -11,7 +11,7 @@ parser = argparse.ArgumentParser(description="Run tests for a project.") parser.add_argument("--workspace", help="Path to the workspace to use for the test. Default is a temporary directory.") parser.add_argument("--dry-run", default=False, action='store_true', help="Do not actually run the test program") parser.add_argument("--really", default=False, action='store_true', help="Do not be deterred if the number of test cases is too high") -parser.add_argument("--build-mode", action='append', metavar='debug,release,...', help="Build mode(s)") +parser.add_argument("--build-modes", action='append', metavar='debug,release,...', help="Build mode(s)") parser.add_argument("--precmd", help="Command to run before each test case. Not affected by --dry-run.") parser.add_argument("--postcmd", help="Command to run after each test case. Not affected by --dry-run.") parser.add_argument("-f", "--testcase-file", help="File that contains one test case (one or more project filters) per line. These test cases will be done in addition to the ones specified on the command line.") @@ -29,7 +29,7 @@ command = args.command project_filters = args.project_filters dry_run = args.dry_run really = args.really -build_mode = ",".join(args.build_mode) if args.build_mode else "" +build_modes = ",".join(args.build_modes) if args.build_modes else "" workspace = args.workspace smoke_test = True @@ -82,8 +82,8 @@ for project_list in test_cases: projects_string = " ".join(project_list) options = "-n" - if build_mode: - options += f" --build-mode {build_mode}" + if build_modes: + options += f" --build-modes {build_modes}" if "cannot be installed in the standard way" in subprocess.check_output(f"opp_env info {projects_string}", shell=True, text=True): options += " --options=source-archive" if smoke_test: diff --git a/tests/smoketest_install_and_run b/tests/smoketest_install_and_run index 2df97656..7a8653b9 100755 --- a/tests/smoketest_install_and_run +++ b/tests/smoketest_install_and_run @@ -113,23 +113,23 @@ assert_contains_line 'make MODE=release invoked' assert_contains_line 'make test invoked' # -# check --build-mode (should set $BUILD_MODES) +# check --build-modes (should set $BUILD_MODES) # rm -rf $WORKSPACE/opp_env_testproject-* -run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-mode=debug +run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-modes=debug assert_contains_line 'BUILD_MODES=debug' assert_contains_line 'make MODE=debug invoked' assert_not_contains 'make MODE=release invoked' rm -rf $WORKSPACE/opp_env_testproject-* -run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-mode=release +run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-modes=release assert_contains_line 'BUILD_MODES=release' assert_contains_line 'make MODE=release invoked' assert_not_contains 'make MODE=debug invoked' rm -rf $WORKSPACE/opp_env_testproject-* -run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-mode=foo,bar +run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-modes=foo,bar assert_contains_line 'BUILD_MODES=foo bar' assert_contains_line 'make MODE=foo invoked' assert_contains_line 'make MODE=bar invoked' diff --git a/tests/smoketest_nixless b/tests/smoketest_nixless index 6c18213f..0c7e07fa 100755 --- a/tests/smoketest_nixless +++ b/tests/smoketest_nixless @@ -108,23 +108,23 @@ assert_contains_line 'make MODE=release invoked' assert_contains_line 'make test invoked' # -# check --build-mode (should set $BUILD_MODES) +# check --build-modes (should set $BUILD_MODES) # rm -rf $WORKSPACE/opp_env_testproject-* -run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-mode=debug +run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-modes=debug assert_contains_line 'BUILD_MODES=debug' assert_contains_line 'make MODE=debug invoked' assert_not_contains 'make MODE=release invoked' rm -rf $WORKSPACE/opp_env_testproject-* -run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-mode=release +run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-modes=release assert_contains_line 'BUILD_MODES=release' assert_contains_line 'make MODE=release invoked' assert_not_contains 'make MODE=debug invoked' rm -rf $WORKSPACE/opp_env_testproject-* -run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-mode=foo,bar +run opp_env install -w $WORKSPACE opp_env_testproject-latest --build-modes=foo,bar assert_contains_line 'BUILD_MODES=foo bar' assert_contains_line 'make MODE=foo invoked' assert_contains_line 'make MODE=bar invoked'