Move/rename JSON output samples.

t/pt-query-digest/json.t

@@ -20,12 +20,12 @@ local $JSONReportFormatter::pretty_json = 1;
 
 my @args    = qw(--output json);
 my $sample  = "$trunk/t/lib/samples";
-my $results = "t/pt-query-digest/samples";
+my $results = "t/pt-query-digest/samples/json";
 
 ok(
    no_diff(
       sub { pt_query_digest::main(@args, "$sample/slowlogs/empty") },
-      "$results/empty_report.txt",
+      "t/pt-query-digest/samples/empty_report.txt",
    ),
    'json output for empty log'
 ) or diag($test_diff);
@@ -33,7 +33,7 @@ ok(
 ok(
    no_diff(
       sub { pt_query_digest::main(@args, "$sample/slowlogs/slow002.txt") },
-      "$results/output_json_slow002.txt",
+      "$results/slow002.txt",
       sed => [ qq/'s!$trunk!TRUNK!'/ ],
    ),
    'json output for slow002'
@@ -45,7 +45,7 @@ ok(
    no_diff(
       sub { pt_query_digest::main(qw(--type tcpdump --limit 10 --watch-server 127.0.0.1:12345),
                                   @args, "$sample/tcpdump/tcpdump021.txt") },
-      "$results/output_json_tcpdump021.txt",
+      "$results/tcpdump021.txt",
       sed => [ qq/'s!$trunk!TRUNK!'/ ],
    ),
    'json output for for tcpdump021',