From 595bffecf71c5d5e87842fcbaad6c795e7ed19d3 Mon Sep 17 00:00:00 2001 From: jkeenan Date: Mon, 31 Oct 2011 20:46:44 -0400 Subject: [PATCH 1/4] Reposition parrot_test_run.tar.gz in a subdirectory (t/archive) so it can be safely decompressed and untarred. --- .gitignore | 2 +- MANIFEST.SKIP | 4 ++-- config/gen/makefiles/root.in | 2 +- examples/io/post.pir | 2 +- lib/Parrot/Harness/Smoke.pm | 2 +- t/archive/README | 4 ++++ t/fullharness | 2 +- t/harness | 2 +- t/harness.pir | 4 ++-- tools/dev/resubmit_smolder.pl | 5 +++-- 10 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 t/archive/README diff --git a/.gitignore b/.gitignore index a49b81bff5..d2ee454b99 100644 --- a/.gitignore +++ b/.gitignore @@ -77,7 +77,6 @@ cachegrind.out.* /parrot_nci_thunk_gen /parrot_nci_thunk_gen.c /parrot_nci_thunk_gen.pbc -/parrot_test_run.tar.gz /parrot_old /pbc_disassemble /pbc_dump @@ -361,6 +360,7 @@ cachegrind.out.* /src/string/charset/*.obj /src/string/encoding/*.o /src/string/encoding/*.obj +/t/archive/parrot_test_run.tar.gz /t/benchmark/*.pasm /t/benchmark/*.pir /t/compilers/data_json/*.pbc diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index aa3a6c5dbc..f33ba07e5c 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -410,8 +410,6 @@ ^/parrot_nci_thunk_gen\.pbc/ ^/parrot_old$ ^/parrot_old/ -^/parrot_test_run\.tar\.gz$ -^/parrot_test_run\.tar\.gz/ ^/pbc_disassemble$ ^/pbc_disassemble/ ^/pbc_dump$ @@ -808,6 +806,8 @@ ^/src/string/encoding/.*\.obj/ ^/src/string/private_cstring\.h$ ^/src/string/private_cstring\.h/ +^/t/archive/parrot_test_run\.tar\.gz$ +^/t/archive/parrot_test_run\.tar\.gz/ ^/t/benchmark/.*\.pasm$ ^/t/benchmark/.*\.pasm/ ^/t/benchmark/.*\.pir$ diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in index 509208cc07..1fbb666bdd 100644 --- a/config/gen/makefiles/root.in +++ b/config/gen/makefiles/root.in @@ -2476,7 +2476,7 @@ test-clean : "test$(EXE)" \ "test.*" $(RM_F) \ - "parrot_test_run.tar.gz" \ + "t/archive/parrot_test_run.tar.gz" \ ".pod_examinable*.sto" # a failing step of cleaning, usually doesn't concern the following steps diff --git a/examples/io/post.pir b/examples/io/post.pir index 0a6b13f0aa..681b9f8b49 100644 --- a/examples/io/post.pir +++ b/examples/io/post.pir @@ -27,7 +27,7 @@ push contents, 'report_file' $P0 = new 'FixedStringArray' set $P0, 1 - $P0[0] = 'parrot_test_run.tar.gz' + $P0[0] = 't/archive/parrot_test_run.tar.gz' push contents, $P0 load_bytecode 'LWP/UserAgent.pir' .const string url = 'http://smolder.parrot.org/app/projects/process_add_report/1' diff --git a/lib/Parrot/Harness/Smoke.pm b/lib/Parrot/Harness/Smoke.pm index a7cf3a8751..55d918de7b 100644 --- a/lib/Parrot/Harness/Smoke.pm +++ b/lib/Parrot/Harness/Smoke.pm @@ -96,7 +96,7 @@ my %SMOLDER_CONFIG = ( username => 'parrot-autobot', password => 'qa_rocks', project_id => 1, - report_file => ['parrot_test_run.tar.gz'], + report_file => ['t/archive/parrot_test_run.tar.gz'], ); # language implementations must pass their respective project id diff --git a/t/archive/README b/t/archive/README new file mode 100644 index 0000000000..5ecbd1efc5 --- /dev/null +++ b/t/archive/README @@ -0,0 +1,4 @@ +README for directory t/archive/ + +This directory exists to have a location for temporary storage of a tarball +created by t/harness or t/fullharness. diff --git a/t/fullharness b/t/fullharness index 347da0e810..149d2b9f29 100644 --- a/t/fullharness +++ b/t/fullharness @@ -74,7 +74,7 @@ if ($archive) { my %env_data = collect_test_environment_data(); my $archive = TAP::Harness::Archive::MultipleHarnesses->new( { verbosity => $ENV{HARNESS_VERBOSE}, - archive => 'parrot_test_run.tar.gz', + archive => 't/archive/parrot_test_run.tar.gz', merge => 1, jobs => $ENV{TEST_JOBS} || 1, extra_properties => \%env_data, diff --git a/t/harness b/t/harness index 5937957359..629f61a8cf 100644 --- a/t/harness +++ b/t/harness @@ -77,7 +77,7 @@ if ($longopts->{archive}) { $harness = TAP::Harness::Archive->new( { verbosity => $ENV{HARNESS_VERBOSE}, - archive => 'parrot_test_run.tar.gz', + archive => 't/archive/parrot_test_run.tar.gz', merge => 1, extra_properties => \%env_data, extra_files => [ 'myconfig', 'config_lib.pir' ], diff --git a/t/harness.pir b/t/harness.pir index 189f6dccc4..1bfbacdd6b 100644 --- a/t/harness.pir +++ b/t/harness.pir @@ -68,7 +68,7 @@ HELP goto L3 L2: harness = new ['TAP';'Harness';'Archive'] - harness.'archive'('parrot_test_run.tar.gz') + harness.'archive'('t/archive/parrot_test_run.tar.gz') options['merge'] = 1 .local pmc env_data env_data = collect_test_environment_data() @@ -379,7 +379,7 @@ TEST push contents, 'report_file' $P0 = new 'FixedStringArray' set $P0, 1 - $P0[0] = 'parrot_test_run.tar.gz' + $P0[0] = 't/archive/parrot_test_run.tar.gz' push contents, $P0 load_bytecode 'LWP/UserAgent.pir' .const string url = 'http://smolder.parrot.org/app/projects/process_add_report/1' diff --git a/tools/dev/resubmit_smolder.pl b/tools/dev/resubmit_smolder.pl index 7db5d5189b..4175a59139 100755 --- a/tools/dev/resubmit_smolder.pl +++ b/tools/dev/resubmit_smolder.pl @@ -10,7 +10,7 @@ send_archive_to_smolder ); -my $tarball = 'parrot_test_run.tar.gz'; +my $tarball = 't/archive/parrot_test_run.tar.gz'; die "Could not locate $tarball" unless (-f $tarball); send_archive_to_smolder(collect_test_environment_data()); @@ -30,7 +30,8 @@ =head1 DESCRIPTION transmission of that tarball failed. The command should be run from the top-level of your checkout of Parrot. It -will fail if no file named F exists in that directory. +will fail if no file named F exists in that +directory. =head1 AUTHOR From bead13540fcc43b12e075bb9e087259bcc432d7d Mon Sep 17 00:00:00 2001 From: jkeenan Date: Mon, 31 Oct 2011 21:02:41 -0400 Subject: [PATCH 2/4] Add new file to MANIFEST. --- MANIFEST | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST b/MANIFEST index faf7448019..4251982776 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1442,6 +1442,7 @@ src/vtables.c [] src/warnings.c [] t/README.pod []doc t/TESTS_STATUS.pod [test] +t/archive/README []doc t/benchmark/benchmarks.t [test] t/codingstd/c_arg_assert.t [test] t/codingstd/c_code_coda.t [test] From 4603865e5ee8540632d9b6711cf7967e3537b6a2 Mon Sep 17 00:00:00 2001 From: jkeenan Date: Mon, 31 Oct 2011 21:07:03 -0400 Subject: [PATCH 3/4] Restore README. --- t/archive/README | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/t/archive/README b/t/archive/README index 5ecbd1efc5..ea00bec61b 100644 --- a/t/archive/README +++ b/t/archive/README @@ -1,4 +1,3 @@ -README for directory t/archive/ +README for t/archive -This directory exists to have a location for temporary storage of a tarball -created by t/harness or t/fullharness. +This directory holds parrot_test_run.tar.gz. From 7fcdbb3ebd100671d5a57fcf9b1e08654ba80419 Mon Sep 17 00:00:00 2001 From: jkeenan Date: Tue, 1 Nov 2011 19:16:22 -0400 Subject: [PATCH 4/4] [codingstd] No trailing whitespace. --- src/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scheduler.c b/src/scheduler.c index c081025af0..c8179b6788 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -202,7 +202,7 @@ Parrot_cx_next_task(PARROT_INTERP, ARGIN(PMC * const scheduler)) if (!VTABLE_isa(interp, task, CONST_STRING(interp, "Task"))) Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION, "Found a non-Task in the task queue.\n"); - + #ifdef _WIN32 /* TODO: Implement on Windows */ #else