Permalink
Browse files

Merging smoke2smolder branch into trunk. Implement's Coke's patch

deactivating old-style smoke testing in favor of Smolder.  Cf.:
https://trac.parrot.org/parrot/ticket/69 and
http://rt.perl.org/rt3/Ticket/Display.html?id=49276.


git-svn-id: https://svn.parrot.org/parrot/trunk@34204 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent d51019f commit 5b64732650e9ef067ced69437da8da1ab13379db @jkeenan jkeenan committed Dec 21, 2008
View
@@ -165,17 +165,4 @@ is deprecated and will be removed.
=back
-=head1 Misc.
-
-=over 4
-
-=item 'make smoke' [post 0.8.2]
-
-The functionality currently provided by "make smoke" will be changing to
-be an alias for "make smolder_test". We're moving towards smolder as our
-single point of online test reporting, and will keep the make target to
-simplify the switch for anyone currently smoking parrot. See RT #49276.
-
-=back
-
=cut
View
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Sun Dec 21 14:10:12 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sun Dec 21 15:12:45 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -3767,8 +3767,6 @@ tools/util/perltidy.conf []
tools/util/pgegrep []
tools/util/release.json []
tools/util/smokeserv-README.pod []
-tools/util/smokeserv-client.pl []
-tools/util/smokeserv-server.pl []
tools/util/templates.json []
tools/util/update_copyright.pl []
xconf/samples/testfoobar []
@@ -32,12 +32,6 @@ help:
@echo ""
@echo " help: Print this help message."
@echo ""
- @echo " smoke: Run the test suite and send smoke.html to "
- @echo " http:////smoke.parrotcode.org//"
- @echo ""
- @echo " smoke-clean: clean up smoke.html"
- @echo ""
- @echo ""
@echo "Following languages are available:"
@echo " $(LANGUAGES)"
@echo "A particular language <lang> can be built, tested and cleand up"
@@ -50,12 +50,6 @@ help:
@echo ""
@echo " help: Print this help message."
@echo ""
- @echo " smoke: Run the unified test suite and send smoke.html to "
- @echo " http:////smoke.parrotcode.org//"
- @echo ""
- @echo " smoke-clean: clean up smoke.html"
- @echo ""
- @echo ""
@echo "Following languages are available:"
@echo " $(LANGUAGES)"
@echo ""
@@ -96,14 +90,6 @@ test-separate: all \
WMLScript.test \
Zcode.test
-
-smoke: all
- $(PERL) t/harness --html
- $(PERL) ../tools/util/smokeserv-client.pl languages_smoke.html
-
-smoke-clean :
- $(RM_F) languages_smoke.html
-
clean: \
abc.clean APL.clean \
BASIC.clean befunge.clean bf.clean \
@@ -123,7 +109,6 @@ clean: \
urm.clean \
WMLScript.clean \
Zcode.clean \
- smoke-clean
realclean: \
abc.realclean APL.realclean \
@@ -690,13 +690,8 @@ help :
@echo " examples_tests: Test the example scripts."
@echo ""
@echo "Smoke Testing:"
- @echo " smoke: Run the test suite and send smoke.html to "
- @echo " http:////smoke.parrotcode.org//"
- @echo " smokej: Same as smoke, but with JIT runcore"
- @echo " smokeexec: Same as smoke, but generate first executables"
- @echo " with the exec runcore"
- @echo " smoke-clean: clean up smoke.html"
@echo " smolder_test: Run the test suite and send report to the smolder server"
+ @echo " smoke: Alias for smolder_test"
@echo ""
@echo "Benchmarks:"
@echo " mopsbench: Million operations"
@@ -725,7 +720,6 @@ help :
@echo " languages-test: Proxy for target 'test' of languages/Makefile"
@echo " languages-test-unified: Proxy for target 'test-unified' of languages/Makefile"
@echo " languages-test-separate: Proxy for target 'test-separate' of languages/Makefile"
- @echo " languages-smoke: Proxy for target 'smoke' of languages/Makefile"
@echo " languages-clean: Proxy for target 'clean' of languages/Makefile"
@echo ""
@echo "Fetch from source repository:"
@@ -1376,9 +1370,6 @@ languages-test-unified :
languages-test-separate :
$(MAKE) languages test-separate
-languages-smoke :
- $(MAKE) languages smoke
-
languages-clean :
$(MAKE) languages clean
@@ -1474,11 +1465,12 @@ test : test_prep
smolder_test : test_prep
$(PERL) t/harness $(EXTRA_TEST_ARGS) --archive --send-to-smolder
+smoke : smolder_test
+
# "core tests" -- test basic functionality but not ancillaries
coretest : test_prep
$(PERL) t/harness $(EXTRA_TEST_ARGS) --core-tests
-
# automake compatibility
check : test
@@ -1613,7 +1605,6 @@ clean : \
examples-clean \
imcc-clean \
compilers-clean \
- smoke-clean \
#INVERSE_CONDITIONED_LINE(win32): cover-clean \
editor-clean
@TEMP_cg_r@
@@ -2273,27 +2264,6 @@ apilist: $(SRC_DIR)/core_pmcs.c
malloclist: $(SRC_DIR)/core_pmcs.c
$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl --macro=PARROT_MALLOC $(HEADERIZER_O_FILES)
-###############################################################################
-#
-# smoke:
-#
-###############################################################################
-
-smoke : all
- $(PERL) t/harness --html $(EXTRA_TEST_ARGS)
- $(PERL) tools/util/smokeserv-client.pl smoke.html
-
-smokej : all
- $(PERL) t/harness --html $(EXTRA_TEST_ARGS) -j
- $(PERL) tools/util/smokeserv-client.pl smoke.html
-
-smokeexec: all
- $(PERL) t/harness --html $(EXTRA_TEST_ARGS) --run-exec $(RUNCORE_TEST_FILES)
- $(PERL) tools/util/smokeserv-client.pl smoke.html
-
-smoke-clean :
- $(RM_F) smoke.html
-
#
# Local variables:
# mode: makefile
View
@@ -24,20 +24,14 @@ testj>. It works just like C<make test>, but uses the JIT engine when possible.
C<make languages-test> runs the test suite for most language implementations
in the languages directory.
-=head2 Submitting smoke test results
+=head2 Submitting smolder test results
-Parrot has a status page with smoke test results
-L<http://smoke.parrotcode.org/smoke/>. You can supply new tests
-results by just running C<make smoke>. It will run the same tests as
-C<make test> would, but will additionally create a HTML table with the test
-results. At the end, it will try to upload the test results to the
-smoke server.
+Parrot has a status page with smoke test results at
+L<http://smolder.plusthree.com/app/public_projects/details/8>.
-It is also possible to run a smoke test on JIT. For that, try running
-C<make smokej>.
-
-C<make languages-smoke> does smoke testing for most language implementations
-in the languages directory.
+You can supply new tests results by just running C<make smoke>.
+It will run the same tests as C<make test> would, but will upload
+the test results to the website.
=head1 Location of the test files
@@ -10,9 +10,6 @@ No author information is given here. This is because maintainers
should be tracked in the respective languages/*/MAINTAINER files, and we
don't want to repeat ourselves.
-For current status of some languages see also
-L<http://smoke.parrotcode.org/smoke/>
-
Languages that work with the unified languages test suite
will have their test results listed under the smokes marked
'languages'.
View
@@ -26,14 +26,6 @@ or
cd languages && make test
-=item Smoke testing
-
- make languages-smoke
-
-or
-
- cd languages && make smoke
-
=item Selected languages
cd languages && perl t/harness --languages=m4,punie
@@ -66,14 +58,12 @@ called by languages/Makefile with an explicit perl.
# Step 0: handle command line args
-my $do_gen_html; # smoke testing
my $languages_list; # select a subset of languages
-my $result = GetOptions( 'html' => \$do_gen_html,
- 'languages=s' => \$languages_list );
+my $result = GetOptions( 'languages=s' => \$languages_list );
# Step 1: find harness files for testable languages
-# Various languages are not yet in smoke testing, some will never be.
+# Various languages are not yet in smoke testing; some will never be.
#
# BASIC No t/harness, two implementations
# ecmascript No t/harness
@@ -124,74 +114,7 @@ foreach my $harness (@harnesses) {
chomp(@tests);
# Step 3: test.
-
-if ( ! $do_gen_html ) {
- Test::Harness::runtests(@tests);
-}
-else {
- my $html_fn = "languages_smoke.html";
- my @smoke_config_vars = qw(
- osname archname cc build_dir cpuarch revision VERSION optimize DEVEL
- );
-
- eval {
- require Test::TAP::HTMLMatrix;
- require Test::TAP::Model::Visual;
- };
- die "You must have Test::TAP::HTMLMatrix installed.\n\n$@"
- if $@;
-
- {
- no warnings qw/redefine once/;
- *Test::TAP::Model::run_tests = sub {
- my $self = shift;
-
- $self->_init;
- $self->{meat}{start_time} = time();
-
- my %stats;
-
- foreach my $file (@_) {
- my $data;
- print STDERR "- $file\n";
- $data = $self->run_test($file);
- $stats{tests} += $data->{results}{max} || 0;
- $stats{ok} += $data->{results}{ok} || 0;
- }
-
- printf STDERR "%s OK from %s tests (%.2f%% ok)\n\n",
- $stats{ok},
- $stats{tests},
- $stats{ok} / $stats{tests} * 100;
-
- $self->{meat}{end_time} = time();
- };
-
- my $start = time();
- my $model = Test::TAP::Model::Visual->new_with_tests(@tests);
- my $end = time();
-
- my $duration = $end - $start;
- my $languages = join( q{ }, @unified_testable_languages );
- my $v = Test::TAP::HTMLMatrix->new(
- $model,
- join("\n",
- "languages: $languages",
- "duration: $duration",
- "branch: unknown",
- "harness_args: languages",
- map { "$_: $PConfig{$_}" } sort @smoke_config_vars),
- );
-
- $v->has_inline_css(1); # no separate css file
-
- open HTML, '>', $html_fn;
- print HTML $v->html();
- close HTML;
-
- print "$html_fn has been generated.\n";
- }
-}
+Test::Harness::runtests(@tests);
# Local Variables:
# mode: cperl
Oops, something went wrong.

0 comments on commit 5b64732

Please sign in to comment.