From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.8 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 324271F4C8 for ; Sat, 2 Nov 2019 02:03:33 +0000 (UTC) From: Eric Wong To: mwrap-perl@80x24.org Subject: [PATCH 7/7] t/mwrap: don't dump unless we check the output Date: Sat, 2 Nov 2019 02:03:31 +0000 Message-Id: <20191102020331.28050-8-e@80x24.org> In-Reply-To: <20191102020331.28050-1-e@80x24.org> References: <20191102020331.28050-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: No point in putting data into the FS cache that we won't read. --- t/mwrap.t | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/t/mwrap.t b/t/mwrap.t index 3dd3d57..8806847 100644 --- a/t/mwrap.t +++ b/t/mwrap.t @@ -18,6 +18,7 @@ my $src = slurp('blib/script/mwrap-perl'); mwrap_run('dump test', $env, '-e', '$x = "hello world" x '.$nr); ok(-s $dump, "dump file written to"); my $s = slurp($dump); + truncate($dump, 0); my $re = qr/([0-9]+)[ \t]+([0-9]+)[ \t]+-e:1[ \t]*\n/sm; my ($bytes, $n); if ($s =~ $re) { @@ -34,18 +35,13 @@ SKIP: { # C++ program which uses malloc via "new" my $exp = `cmake -h`; skip 'cmake missing', 2 if $?; skip "`cmake -h' gave no output", 2 unless $exp =~ /\S/s; - open my $truncate, '>', $dump or die; - close $truncate or die; - my $env = { MWRAP => "dump_path:$dump" }; - mwrap_run('cmake (C++ new)', $env, '-e', - 'system(qw(cmake -h)); exit $?'); + mwrap_run('cmake (C++ new)', {}, '-e', 'system(qw(cmake -h)); exit $?'); my $res = slurp($out); is($res, $exp, "`cmake -h' works"); }; { - my $env = { MWRAP => "dump_path:$dump" }; - mwrap_run('total_bytes*', $env, '-e', <<'E1'); + mwrap_run('total_bytes*', {}, '-e', <<'E1'); my $A = Devel::Mwrap::total_bytes_allocated(); my $f = Devel::Mwrap::total_bytes_freed(); print("$A - $f\n"); @@ -55,9 +51,8 @@ E1 } { - my $env = { MWRAP => "dump_path:$dump" }; - mwrap_run('source location', $env, 't/source_location.perl'); - mwrap_run('source location via -d:', $env, + mwrap_run('source location', {}, 't/source_location.perl'); + mwrap_run('source location via -d:', {}, '-d:Mwrap', 't/source_location.perl'); }