Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of git://github.com/parrot/parrot
  • Loading branch information
niner committed Nov 2, 2011
2 parents 752ba61 + 9e91735 commit 3656362
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions MANIFEST
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions MANIFEST.SKIP
Expand Up @@ -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$
Expand Down Expand Up @@ -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$
Expand Down
2 changes: 1 addition & 1 deletion config/gen/makefiles/root.in
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/io/post.pir
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/Parrot/Harness/Smoke.pm
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions t/archive/README
@@ -0,0 +1,3 @@
README for t/archive

This directory holds parrot_test_run.tar.gz.
2 changes: 1 addition & 1 deletion t/fullharness
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion t/harness
Expand Up @@ -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' ],
Expand Down
4 changes: 2 additions & 2 deletions t/harness.pir
Expand Up @@ -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()
Expand Down Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions tools/dev/resubmit_smolder.pl
Expand Up @@ -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());
Expand All @@ -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<parrot_test_run.tar.gz> exists in that directory.
will fail if no file named F<t/archive/parrot_test_run.tar.gz> exists in that
directory.
=head1 AUTHOR
Expand Down

0 comments on commit 3656362

Please sign in to comment.