Commit e263e11f authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Remove --skip_build from script

parent 9d704f56

scripts/IvasBuildAndRunChecks.py

+0 −6
Original line number Diff line number Diff line
@@ -105,11 +105,6 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
            help="build the basop version for instrumentation",

            action="store_true",

        )

        self.parser.add_argument(

            "--skip_build",

            help="skip instrumentation and build",

            action="store_true",

        )



    def run(self):
@@ -176,7 +171,6 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
                    max_workers=self.args["max_workers"],

                    mem_only=self.args["wmc_tool_mem_only"],

                    basop=self.args["basop"],

                    skip_build=self.args["skip_build"],

                )

            else:

                br.add_check(

scripts/pyivastest/IvasSvnBuilder.py

+102 −117
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ class IvasBuilder(IvasBaseClass): 
        instrumented=False,

        mem_only=False,

        basop=False,

        skip_build=False,

    ):

        """
@@ -267,9 +266,6 @@ class IvasBuilder(IvasBaseClass): 
        build_log = open(build_log_name, "w")

        # build

        if instrumented:

            if skip_build:

                self.logger.console("Skipping instrumentation", logging.INFO)

            else:

            self.logger.console("Instrumenting...", logging.INFO)

            make_dir = os.path.join(self.src_dir, "scripts", "c-code_instrument")

            # remove if it c-code_instrument already exists
@@ -297,9 +293,6 @@ class IvasBuilder(IvasBaseClass): 


        build_log.write("".join(["Build directory: ", make_dir]))

        build_log.write("\n")

        if skip_build:

            self.logger.console("Skipping building", logging.INFO)

        else:

        self.logger.console("Building...", logging.INFO)



        # to be safe remove existing binaries
@@ -657,7 +650,6 @@ class IvasSvnBuilder(IvasBuilder): 
        instrumented=False,

        mem_only=False,

        basop=False,

        skip_build=False,

    ):

        """
@@ -688,7 +680,6 @@ class IvasSvnBuilder(IvasBuilder): 
            instrumented=instrumented,

            mem_only=mem_only,

            basop=basop,

            skip_build=skip_build,

        )
@@ -798,7 +789,6 @@ class IvasBuilderAndRunner(IvasBaseClass): 
        timeout=None,

        mem_only=False,

        basop=False,

        skip_build=False,

    ):

        """
@@ -845,7 +835,6 @@ class IvasBuilderAndRunner(IvasBaseClass): 
            self.build_and_run_dict[cfg_name]["mem_only"] = mem_only

            self.build_and_run_dict[cfg_name]["make_options"] = make_options

            self.build_and_run_dict[cfg_name]["basop"] = basop

            self.build_and_run_dict[cfg_name]["skip_build"] = skip_build

        else:

            self.logger.console("Adding config {}".format(cfg_name), logging.INFO)

            run_dir = os.path.join(self.builder.src_dir, cfg_name)
@@ -892,7 +881,6 @@ class IvasBuilderAndRunner(IvasBaseClass): 
                    "make_options": make_options,

                    "analyzer": new_analyzer,

                    "basop": basop,

                    "skip_build": skip_build,

                }

            }

            self.build_and_run_dict.update(cfg_dict)
@@ -1077,7 +1065,6 @@ class IvasBuilderAndRunner(IvasBaseClass): 
                instrumented=cfg["instrumented"],

                mem_only=cfg["mem_only"],

                basop=cfg["basop"],

                skip_build=cfg["skip_build"]

            )

            self.build_and_run_dict[cfg_name]["runner"].encoder = self.builder.encoder

            self.build_and_run_dict[cfg_name]["runner"].decoder = self.builder.decoder
@@ -1280,7 +1267,6 @@ class IvasBuilderAndRunner(IvasBaseClass): 
        max_workers=1,

        mem_only=False,

        basop=False,

        skip_build=False,

    ):

        """
@@ -1315,7 +1301,6 @@ class IvasBuilderAndRunner(IvasBaseClass): 
            max_workers=max_workers,

            mem_only=mem_only,

            basop=basop,

            skip_build=skip_build,

        )



    # TODO: this is used nowhere, is this still needed?

scripts/smoke_test_complexity_basop.sh

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ fi 
cfg=./scripts/config/ci_linux_ltv.json

ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"

duration_arg=""

complexity_cmd="--checks COMPLEXITY --wmc_tool_mem_only --basop --skip_build --create_complexity_tables"

complexity_cmd="--checks COMPLEXITY --wmc_tool_mem_only --basop --create_complexity_tables"

max_num_workers="--max_workers $MAX_CORES"



# prepare combined format test signals