From 6763e32fdd621d4fd7d2d1de9277865d7b685d1e Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 23 Oct 2020 15:36:24 +0100 Subject: [PATCH] Updated patch-coverage.pl script Change-Id: If8394b2ababc4d6769b3ce04420c855778e0c4b5 --- automated-tests/README.md | 2 +- automated-tests/patch-coverage.pl | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/automated-tests/README.md b/automated-tests/README.md index 590571d..f256435 100644 --- a/automated-tests/README.md +++ b/automated-tests/README.md @@ -150,7 +150,7 @@ a refspec to the latest commit, or uses the index/working tree. Testing on target ================= -To build for target, first build and install dali-core, dali-adaptor and dali-toolkit, then build dali-capi without --keep-packs option. +To build for target, first build and install dali-core, dali-adaptor and dali-toolkit. You will need to install libconfig-tiny-perl: diff --git a/automated-tests/patch-coverage.pl b/automated-tests/patch-coverage.pl index 702dc0b..3a97dac 100755 --- a/automated-tests/patch-coverage.pl +++ b/automated-tests/patch-coverage.pl @@ -54,7 +54,7 @@ sub add_counts($$); sub info(@); our $repo = Git->repository(); -our $debug=1; +our $debug=0; our $pd_debug=0; our $root; our %info_data; # Hash containing all data from .info files @@ -1316,7 +1316,7 @@ my $cwd = getcwd(); # expect this to be automated-tests folder # execute coverage.sh, generating build/tizen/dali.info from lib, and # *.dir/dali.info. Don't generate html -`coverage.sh -n`; +print `./coverage.sh -n`; chdir ".."; $root = getcwd(); @@ -1338,12 +1338,7 @@ foreach (@info_files) my @cmd=('--no-pager','diff','--no-ext-diff','-U0','--no-color'); my $status = $repo->command("status", "-s"); -if(scalar(@ARGV)) # REMOVE ME -{ - # REMOVE ME - temp to get past modifying this script in place. - push @cmd, @ARGV; -} -elsif( $status eq "" && !scalar(@ARGV)) +if( $status eq "" && !scalar(@ARGV)) { # There are no changes in the index or working tree, and # no diff arguments to append. Use the last patch instead. -- 2.7.4