diff --git a/.gitignore b/.gitignore index 9a322d6..a975771 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -Makefile +/Makefile +/eclectus_test_run.tar.gz /driver_nqp.pbc /src/builtins/all.pbc /src/pmc/eclectus_group.c diff --git a/config/makefiles/root.in b/config/makefiles/root.in index 58fad51..82b0a45 100644 --- a/config/makefiles/root.in +++ b/config/makefiles/root.in @@ -17,8 +17,8 @@ BUILD_DYNPMC = $(PERL) @build_dir@/tools/build/dynpmc.pl #IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@ # Set up directories -PARROT_DYNEXT = @build_dir@/runtime/parrot/dynext -PMC_DIR = src/pmc +PARROT_DYNEXT = @build_dir@/runtime/parrot/dynext +PMC_DIR = src/pmc ECLECTUS_GROUP = $(PMC_DIR)/eclectus_group@load_ext@ PMCS = \ @@ -42,20 +42,28 @@ PMC_SOURCES = \ # The default target default: build +# This is a listing of all targets, that are meant to be called by users help : @echo "" @echo "Following targets are available for the user:" @echo "" + @echo "Building:" @echo " build: Builds the dynamic PMCSs needed by Eclectus." @echo " This is the default target." @echo "" + @echo "Testing:" @echo " test: Run the test suite." + @echo " smoke: Run the test suite and send report to the smolder server" @echo "" - @echo " clean: Clean up temporary files." - @echo "" - @echo " realclean: Clean up generated files." + @echo "Cleaning:" + @echo " clean: Clean up." + @echo " clean-test: Clean up temporary files from testing." + @echo " clean-pmc: Clean up temporary files from the PMC build process." + @echo " realclean: Clean and remove Makefile." @echo "" + @echo "Misc:" @echo " help: Print this help message." + @echo "" # regenerate the Makefile Makefile: config/makefiles/root.in @@ -78,15 +86,23 @@ driver_nqp.pbc: src/builtins/all.pbc driver_nqp.pir src/builtins/all.pbc: src/builtins/all.pir $(PARROT) -o src/builtins/all.pbc src/builtins/all.pir +# testing +test: build + $(PERL) t/harness + +# run the test suite, create a TAP archive and send it off to smolder +smoke : build + - $(PERL) t/harness --archive --send-to-smolder + # cleaning up -clean: dynext-clean test-clean +clean: clean-pmc clean-test $(RM_F) \ stst.out \ driver_nqp.pbc \ src/builtins/all.pbc -dynext-clean: +clean-pmc: $(RM_F) \ $(PMC_DIR)/*.h \ $(PMC_DIR)/*.c \ @@ -103,10 +119,7 @@ dynext-clean: realclean: clean $(RM_F) Makefile -# testing -test: build - $(PERL) t/harness - -test-clean: - $(RM_F) t/*.nqp - $(RM_F) t/*.pir +# Local variables: +# mode: makefile +# End: +# vim: ft=make: diff --git a/t/harness b/t/harness index 2856a87..e7cb6d6 100644 --- a/t/harness +++ b/t/harness @@ -78,7 +78,7 @@ $verbosity ||= 0; if ( $archive_flag ) { my %env_data = Parrot::Harness::Smoke::collect_test_environment_data(); - my $report_file = ['pipp_test_run.tar.gz']; + my $report_file = ['eclectus_test_run.tar.gz']; my $harness = TAP::Harness::Archive->new( { exec => $exec_sub, @@ -92,7 +92,7 @@ $verbosity ||= 0; if ( $send_to_smolder_flag ) { $env_data{report_file} = $report_file; - $env_data{project_id} = 10; + $env_data{project_id} = 13; Parrot::Harness::Smoke::send_archive_to_smolder(%env_data); } } else {