Skip to content

Commit

Permalink
Merge pull request #206 from jkeenan/remove-nytprofpf-20221108
Browse files Browse the repository at this point in the history
Remove program bin/nytprofpf
  • Loading branch information
jkeenan committed Oct 5, 2023
2 parents f0c73ae + d9861d3 commit dc4905b
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 196 deletions.
1 change: 0 additions & 1 deletion MANIFEST
Expand Up @@ -8,7 +8,6 @@ bin/nytprofcg
bin/nytprofcsv
bin/nytprofhtml
bin/nytprofmerge
bin/nytprofpf
Changes
demo/1m_stmts.pl
demo/closure.pl
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.SKIP
Expand Up @@ -26,3 +26,5 @@
^t/.*\.out$
t/nytprof_test30-fork-0\.out\.\d+$
t/test.*outdir/
^travis\.yml$
^.travis\.yml$
3 changes: 1 addition & 2 deletions Makefile.PL
Expand Up @@ -33,7 +33,6 @@ if ($ENV{PERL_CORE}) {
'bin/nytprofcsv' => '$(INST_MAN1DIR)/nytprofcsv.1',
'bin/nytprofcalls'=> '$(INST_MAN1DIR)/nytprofcalls.1',
'bin/nytprofcg' => '$(INST_MAN1DIR)/nytprofcg.1',
'bin/nytprofpf' => '$(INST_MAN1DIR)/nytprofpf.1'
} );
}

Expand Down Expand Up @@ -183,7 +182,7 @@ WriteMakefile(
LIBS => [join ' ', @libs],
OBJECT => q/$(O_FILES)/,
FUNCLIST => ['boot_Devel__NYTProf', 'boot_Devel__NYTProf__FileHandle'],
EXE_FILES => ['bin/nytprofhtml', 'bin/flamegraph.pl', 'bin/nytprofcsv', 'bin/nytprofcalls', 'bin/nytprofcg', 'bin/nytprofmerge', 'bin/nytprofpf'],
EXE_FILES => ['bin/nytprofhtml', 'bin/flamegraph.pl', 'bin/nytprofcsv', 'bin/nytprofcalls', 'bin/nytprofcg', 'bin/nytprofmerge'],
@man,
INC => $INCLUDE,
clean => {
Expand Down
166 changes: 0 additions & 166 deletions bin/nytprofpf

This file was deleted.

27 changes: 0 additions & 27 deletions t/lib/NYTProfTest.pm
Expand Up @@ -66,7 +66,6 @@ my $text_extn_info = {
rdt => { order => 20, tests => ($opts{mergerdt}) ? 2 : 1, },
x => { order => 30, tests => 3, },
calls => { order => 40, tests => 1, },
pf => { order => 50, tests => 2, },
};

# having t/* in @INC is necessary for prefix-stripping
Expand All @@ -87,7 +86,6 @@ my $bindir = (grep {-d} qw(./blib/script ../blib/script))[0] || do {
my $nytprofcsv = File::Spec->catfile($bindir, "nytprofcsv");
my $nytprofcalls = File::Spec->catfile($bindir, "nytprofcalls");
my $nytprofhtml = File::Spec->catfile($bindir, "nytprofhtml");
my $nytprofpf = File::Spec->catfile($bindir, "nytprofpf");
my $nytprofmerge = File::Spec->catfile($bindir, "nytprofmerge");

my $path_sep = $Config{path_sep} || ':';
Expand Down Expand Up @@ -372,9 +370,6 @@ sub run_test {

verify_csv_report($test, $tag, $test_datafile, $outdir);
}
elsif ($type eq 'pf') {
verify_platforms_csv_report($test, $tag, $test_datafile, $outdir);
}
elsif ($type =~ /^(?:pl|pm|new|outdir)$/) {
# skip; handy for "test.pl t/test01.*"
}
Expand Down Expand Up @@ -678,28 +673,6 @@ sub verify_csv_report {
is(join("\n", @accuracy_errors), '', "$test times should be reasonable");
}

sub verify_platforms_csv_report {
my ($test, $tag, $profile_datafile, $outdir) = @_;

my $outfile = "$outdir/$test.csv";

my $cmd = "$perl $nytprofpf --file=$profile_datafile --out=$outfile";
ok run_command($cmd), "nytprofpf runs ok";

my $got = slurp_file($outfile);

#test if all lines from .pf are contained in result file
#(we can not be sure about the order, so we match each line individually)
my $match_result = 1;
open (EXPECTED, $test);
while (<EXPECTED>) {
$match_result = $match_result && $got =~ m/$_/;
}
close (EXPECTED);

ok $match_result, "$outfile file matches $test";
}

sub pop_times {
my $hash = shift || return;

Expand Down

0 comments on commit dc4905b

Please sign in to comment.