From 77ec2dc875e933c4f013196e2d2ff7dddea43ac5 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 29 Nov 2020 15:06:29 -0500 Subject: [PATCH] Internals: Rename some CI comments --- nodist/code_coverage | 64 ++++++++++++------------- test_regress/t/t_hier_block.pl | 2 +- test_regress/t/t_hier_block_nohier.pl | 2 +- test_regress/t/t_hier_block_sc.pl | 2 +- test_regress/t/t_hier_block_vlt.pl | 2 +- test_regress/t/t_leak.pl | 2 +- test_regress/t/t_split_var_0.pl | 2 +- test_regress/t/t_split_var_2_trace.pl | 2 +- test_regress/t/t_trace_litendian.pl | 2 +- test_regress/t/t_trace_litendian_fst.pl | 2 +- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/nodist/code_coverage b/nodist/code_coverage index 869027ecf..598d5b94a 100755 --- a/nodist/code_coverage +++ b/nodist/code_coverage @@ -83,28 +83,28 @@ sub test { require "./nodist/code_coverage.dat"; if ($Opt_Stages{1}) { - travis_fold_start("configure"); + ci_fold_start("configure"); print "Stage 1: configure (coverage on)\n"; run("make distclean || true"); run("autoconf"); # Exceptions can pollute the branch coverage data run("./configure --enable-longtests CXX='g++ --coverage -fno-exceptions -DVL_GCOV'"); - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{2}) { - travis_fold_start("build"); + ci_fold_start("build"); print "Stage 2: build\n"; my $nproc = Unix::Processors->new->max_online; run("make -k -j $nproc VERILATOR_NO_OPT_BUILD=1"); # The optimized versions will not collect good coverage, overwrite them run("cp bin/verilator_bin_dbg bin/verilator_bin"); run("cp bin/verilator_coverage_bin_dbg bin/verilator_coverage_bin"); - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{3}) { - travis_fold_start("test"); + ci_fold_start("test"); print "Stage 3: make tests (with coverage on)\n"; if ($#Opt_Tests < 0) { run("make examples VERILATOR_NO_OPT_BUILD=1") @@ -121,12 +121,12 @@ sub test { run($test); } } - travis_fold_end(); + ci_fold_end(); } my $cc_dir = "nodist/obj_dir/coverage"; if ($Opt_Stages{4}) { - travis_fold_start("gcno"); + ci_fold_start("gcno"); print "Stage 4: Create gcno files under $cc_dir\n"; mkpath($cc_dir); mkpath("$cc_dir/info"); @@ -165,11 +165,11 @@ sub test { } } } - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{5} && $Opt_Fastcov) { - travis_fold_start("fastcov"); + ci_fold_start("fastcov"); # Must run in root directory to find all files mkpath($cc_dir); #run("${RealBin}/fastcov.py -b -c src/obj_dbg -X". @@ -178,11 +178,11 @@ sub test { run("${RealBin}/fastcov.py -b -c src/obj_dbg -X --lcov". " --exclude /usr --exclude test_regress" ." -o ${cc_dir}/app_total.info"); - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{5} && !$Opt_Fastcov) { - travis_fold_start("infos"); + ci_fold_start("infos"); print "Stage 5: make infos\n"; my $dats = `find . -print | grep .gcda`; my %dirs; @@ -199,20 +199,20 @@ sub test { })->run; } $Fork->wait_all; - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{6}) { - travis_fold_start("clone"); + ci_fold_start("clone"); # No control file to override single lines, so replicate the sources # Also lets us see the insertion markers in the HTML source res print "Stage 6: Clone sources under $cc_dir\n"; clone_sources($cc_dir); - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{8} && !$Opt_Fastcov) { - travis_fold_start("copy"); + ci_fold_start("copy"); print "Stage 8: Copy .gcno files\n"; my $dats = `find . -print | grep .gcno`; foreach my $dat (sort (split '\n', $dats)) { @@ -221,11 +221,11 @@ sub test { #print "cp $dat, $outdat);\n"; cp($dat, $outdat); } - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{10} && !$Opt_Fastcov) { - travis_fold_start("combine"); + ci_fold_start("combine"); print "Stage 10: Combine data files\n"; { run("cd $cc_dir ; lcov -c -i -d src/obj_dbg -o app_base.info"); @@ -243,11 +243,11 @@ sub test { } } } - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{11}) { - travis_fold_start("dirs"); + ci_fold_start("dirs"); print "Stage 11: Cleanup paths\n"; if ($Opt_Fastcov) { cleanup_abs_paths_info($cc_dir, "$cc_dir/app_total.info", "$cc_dir/app_total.info"); @@ -255,11 +255,11 @@ sub test { } else { cleanup_abs_paths_info($cc_dir, "$cc_dir/app_total.info", "$cc_dir/app_total.info"); } - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{12}) { - travis_fold_start("filter"); + ci_fold_start("filter"); print "Stage 12: Filter processed source files\n"; my $inc = ''; foreach my $glob (@Source_Globs) { @@ -282,24 +282,24 @@ sub test { } else { run("cd $cc_dir ; lcov --remove app_total.info $exc -o app_total_f.info"); } - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{17}) { - travis_fold_start("report"); + ci_fold_start("report"); print "Stage 17: Create HTML\n"; run("cd $cc_dir ; genhtml app_total_f.info --demangle-cpp" ." --rc lcov_branch_coverage=1 --rc genhtml_hi_limit=100 --output-directory html"); - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{18}) { - travis_fold_start("upload"); + ci_fold_start("upload"); print "Stage 18: Upload\n"; my $cmd = "bash <(curl -s https://codecov.io/bash) -f $cc_dir/app_total.info"; print "print: Not running: export CODECOV_TOKEN=\n"; print "print: Not running: $cmd\n"; - travis_fold_end(); + ci_fold_end(); } if ($Opt_Stages{19}) { @@ -425,13 +425,13 @@ sub run { ($status == 0) or die "%Error: Command Failed $command, $status, stopped"; } -our $_Travis_Action; -sub travis_fold_start { - $_Travis_Action = shift; - print "travis_fold:start:$_Travis_Action\n"; +our $_Ci_Action; +sub ci_fold_start { + $_Ci_Action = shift; + print "travis_fold:start:$_Ci_Action\n"; } -sub travis_fold_end { - print "travis_fold:end:$_Travis_Action\n"; +sub ci_fold_end { + print "travis_fold:end:$_Ci_Action\n"; } ####################################################################### diff --git a/test_regress/t/t_hier_block.pl b/test_regress/t/t_hier_block.pl index e334fd536..e856d3cd8 100755 --- a/test_regress/t/t_hier_block.pl +++ b/test_regress/t/t_hier_block.pl @@ -12,7 +12,7 @@ clean_objs(); scenarios(vlt_all => 1); -# Travis environment offers 2 VCPUs, 2 thread setting causes the following warning. +# CI environment offers 2 VCPUs, 2 thread setting causes the following warning. # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads. # So use 6 threads here though it's not optimal in performace wise, but ok. diff --git a/test_regress/t/t_hier_block_nohier.pl b/test_regress/t/t_hier_block_nohier.pl index ef6ebf31a..006c981b3 100755 --- a/test_regress/t/t_hier_block_nohier.pl +++ b/test_regress/t/t_hier_block_nohier.pl @@ -16,7 +16,7 @@ clean_objs(); scenarios(vlt_all => 1); top_filename("t/t_hier_block.v"); -# Travis environment offers 2 VCPUs, 2 thread setting causes the following warning. +# CI environment offers 2 VCPUs, 2 thread setting causes the following warning. # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads. # So use 6 threads here though it's not optimal in performace wise, but ok. compile( diff --git a/test_regress/t/t_hier_block_sc.pl b/test_regress/t/t_hier_block_sc.pl index 731aec401..7b85fedd8 100755 --- a/test_regress/t/t_hier_block_sc.pl +++ b/test_regress/t/t_hier_block_sc.pl @@ -12,7 +12,7 @@ clean_objs(); top_filename("t/t_hier_block.v"); -# Travis environment offers 2 VCPUs, 2 thread setting causes the following warning. +# CI environment offers 2 VCPUs, 2 thread setting causes the following warning. # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads. # So use 6 threads here though it's not optimal in performace wise, but ok. scenarios(vlt_all => 1); diff --git a/test_regress/t/t_hier_block_vlt.pl b/test_regress/t/t_hier_block_vlt.pl index fc4e7ccc9..f5231113b 100755 --- a/test_regress/t/t_hier_block_vlt.pl +++ b/test_regress/t/t_hier_block_vlt.pl @@ -13,7 +13,7 @@ clean_objs(); scenarios(vlt_all => 1); top_filename("t/t_hier_block.v"); -# Travis environment offers 2 VCPUs, 2 thread setting causes the following warning. +# CI environment offers 2 VCPUs, 2 thread setting causes the following warning. # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads. # So use 6 threads here though it's not optimal in performace wise, but ok. compile( diff --git a/test_regress/t/t_leak.pl b/test_regress/t/t_leak.pl index 6e0507280..4ab37524e 100755 --- a/test_regress/t/t_leak.pl +++ b/test_regress/t/t_leak.pl @@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di if ($Self->{vltmt} && exists $ENV{TRAVIS_DIST} && $ENV{TRAVIS_DIST} eq "trusty") { - skip("Multithreaded test does not work under Travis w/ Ubuntu Trusty"); + skip("Multithreaded test does not work under CI w/ Ubuntu Trusty"); } scenarios(vlt_all => 1); diff --git a/test_regress/t/t_split_var_0.pl b/test_regress/t/t_split_var_0.pl index ee21699a3..5f07afe64 100755 --- a/test_regress/t/t_split_var_0.pl +++ b/test_regress/t/t_split_var_0.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -# Travis environment offers 2 VCPUs, 2 thread setting causes the following warning. +# CI environment offers 2 VCPUs, 2 thread setting causes the following warning. # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads. # So use 6 threads here though it's not optimal in performace wise, but ok. compile( diff --git a/test_regress/t/t_split_var_2_trace.pl b/test_regress/t/t_split_var_2_trace.pl index 49fd37f82..c79ed778a 100755 --- a/test_regress/t/t_split_var_2_trace.pl +++ b/test_regress/t/t_split_var_2_trace.pl @@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); top_filename("t/t_split_var_0.v"); -# Travis environment offers 2 VCPUs, 2 thread setting causes the following warning. +# CI environment offers 2 VCPUs, 2 thread setting causes the following warning. # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads. # So use 6 threads here though it's not optimal in performace wise, but ok. compile( diff --git a/test_regress/t/t_trace_litendian.pl b/test_regress/t/t_trace_litendian.pl index 6ed5efd1c..91cc2e48f 100755 --- a/test_regress/t/t_trace_litendian.pl +++ b/test_regress/t/t_trace_litendian.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -# Travis environment offers 2 VCPUs, 2 thread setting causes the following warning. +# CI environment offers 2 VCPUs, 2 thread setting causes the following warning. # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads. # Strangely, asking for more threads makes it go away. compile( diff --git a/test_regress/t/t_trace_litendian_fst.pl b/test_regress/t/t_trace_litendian_fst.pl index f13aa0c0d..4918c10bf 100755 --- a/test_regress/t/t_trace_litendian_fst.pl +++ b/test_regress/t/t_trace_litendian_fst.pl @@ -12,7 +12,7 @@ scenarios(simulator => 1); top_filename("t/t_trace_litendian.v"); -# Travis environment offers 2 VCPUs, 2 thread setting causes the following warning. +# CI environment offers 2 VCPUs, 2 thread setting causes the following warning. # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads. # Strangely, asking for more threads makes it go away. compile(