diff --git a/Makefile.am b/Makefile.am index aed2a72cbd..8ab2f38935 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,56 +9,73 @@ AM_CXXFLAGS += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\"" AM_CXXFLAGS += -std=c++0x if ENABLE_COVERAGE - AM_CFLAGS += -O0 --coverage - AM_CXXFLAGS += -O0 --coverage - AM_LDFLAGS += -O0 --coverage -lgcov + AM_CFLAGS += -O0 --coverage + AM_CXXFLAGS += -O0 --coverage + AM_LDFLAGS += -O0 --coverage -lgcov else - AM_CFLAGS += -O2 - AM_CXXFLAGS += -O2 - AM_LDFLAGS += -O2 + AM_CFLAGS += -O2 + AM_CXXFLAGS += -O2 + AM_LDFLAGS += -O2 endif +VERSION = $(LIBSASS_VERSION) + +EXTRA_DIST = \ + COPYING \ + INSTALL \ + LICENSE \ + Readme.md + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = support/libsass.pc lib_LTLIBRARIES = libsass.la libsass_la_SOURCES = \ - cencode.c \ - ast.cpp \ - base64vlq.cpp \ - bind.cpp \ - constants.cpp \ - context.cpp \ - contextualize.cpp \ - copy_c_str.cpp \ - error_handling.cpp \ - eval.cpp \ - expand.cpp \ - extend.cpp \ - file.cpp \ - functions.cpp \ - inspect.cpp \ - node.cpp \ - json.cpp \ - output_compressed.cpp \ - output_nested.cpp \ - parser.cpp \ - prelexer.cpp \ - remove_placeholders.cpp \ - sass.cpp \ - sass_util.cpp \ - sass_values.cpp \ - sass_context.cpp \ - sass_functions.cpp \ - sass_interface.cpp \ - sass2scss.cpp \ - source_map.cpp \ - to_c.cpp \ - to_string.cpp \ - units.cpp \ - utf8_string.cpp \ - util.cpp + ast_fwd_decl.hpp ast_def_macros.hpp \ + kwd_arg_macros.hpp memory_manager.hpp \ + position.hpp operation.hpp \ + subset_map.hpp mapping.hpp \ + color_names.hpp backtrace.hpp \ + cencode.c b64/cencode.h b64/encode.h \ + token.hpp environment.hpp \ + paths.hpp debug.hpp \ + utf8.h utf8/core.h \ + utf8/checked.h utf8/unchecked.h \ + ast.cpp ast.hpp \ + base64vlq.cpp base64vlq.hpp \ + bind.cpp bind.hpp \ + constants.cpp constants.hpp \ + context.cpp context.hpp \ + contextualize.cpp contextualize.hpp \ + copy_c_str.cpp copy_c_str.hpp \ + error_handling.cpp error_handling.hpp \ + eval.cpp eval.hpp \ + expand.cpp expand.hpp \ + extend.cpp extend.hpp \ + file.cpp file.hpp \ + functions.cpp functions.hpp \ + inspect.cpp inspect.hpp \ + node.cpp node.hpp \ + json.cpp json.hpp \ + output_compressed.cpp output_compressed.hpp \ + output_nested.cpp output_nested.hpp \ + parser.cpp parser.hpp \ + prelexer.cpp prelexer.hpp \ + remove_placeholders.cpp remove_placeholders.hpp \ + sass.cpp sass.h \ + sass_util.cpp sass_util.hpp \ + sass_values.cpp sass_values.h \ + sass_context.cpp sass_context.h \ + sass_functions.cpp sass_functions.h \ + sass_interface.cpp sass_interface.h \ + sass2scss.cpp sass2scss.h \ + source_map.cpp source_map.hpp \ + to_c.cpp to_c.hpp \ + to_string.cpp to_string.hpp \ + units.cpp units.hpp \ + utf8_string.cpp utf8_string.hpp \ + util.cpp util.hpp libsass_la_CFLAGS = $(AM_CFLAGS) libsass_la_CXXFLAGS = $(AM_CXXFLAGS) @@ -81,32 +98,48 @@ nodist_EXTRA_sassc_bin_SOURCES = non-existent-file-to-force-CXX-linking.cxx nodist_EXTRA_libsass_la_SOURCES = non-existent-file-to-force-CXX-linking.cxx endif +SASS_SASSC_PATH ?= sassc +SASS_SPEC_PATH ?= sass-spec +SASSC_BIN = $(SASS_SASSC_PATH)/bin/sassc + TESTS = \ $(SASS_SPEC_PATH)/spec/basic \ - $(SASS_SPEC_PATH)/spec/benchmarks \ - $(SASS_SPEC_PATH)/spec/bourbon \ + $(SASS_SPEC_PATH)/spec/css \ + $(SASS_SPEC_PATH)/spec/extend-tests \ + $(SASS_SPEC_PATH)/spec/extends \ $(SASS_SPEC_PATH)/spec/libsass \ + $(SASS_SPEC_PATH)/spec/libsass-closed-issues \ + $(SASS_SPEC_PATH)/spec/maps \ + $(SASS_SPEC_PATH)/spec/misc \ + $(SASS_SPEC_PATH)/spec/regressions \ $(SASS_SPEC_PATH)/spec/scss \ - $(SASS_SPEC_PATH)/spec/todo - -LOG_COMPILER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -AM_LOG_FLAGS = -c ./sass-tester - -SASS_SASSC_PATH ?= sassc -SASS_SPEC_PATH ?= sass-spec -SASSC_BIN = $(SASS_SASSC_PATH)/bin/sassc -RUBY_BIN = ruby + $(SASS_SPEC_PATH)/spec/scss-tests \ + $(SASS_SPEC_PATH)/spec/types + +SASS_TEST_FLAGS = +LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) ./script/tap-driver +AM_LOG_FLAGS = -c ./sassc_bin --ignore-todo $(LOG_FLAGS) +if USE_TAP + AM_LOG_FLAGS += -t + SASS_TEST_FLAGS += -t | tapout + LOG_COMPILER = ./script/tap-runner $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb +else + LOG_COMPILER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb +endif $(SASSC_BIN): libsass.la cd $(SASS_SASSC_PATH) && $(MAKE) test: $(SASSC_BIN) - $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) -s $(LOG_FLAGS) $(SASS_SPEC_PATH) + $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS) test_build: $(SASSC_BIN) - $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) -s --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) + $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS) + +test_full: $(SASSC_BIN) + $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS) test_issues: $(SASSC_BIN) - $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues + $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues $(SASS_TEST_FLAGS) endif diff --git a/configure.ac b/configure.ac index 9e4614c061..f04a57a3b5 100644 --- a/configure.ac +++ b/configure.ac @@ -2,12 +2,13 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT([libsass], [1.0], [support@moovweb.com]) +AC_INIT([libsass], [3.0.3], [support@moovweb.com]) AC_CONFIG_SRCDIR([ast.hpp]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.10 foreign]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_CONFIG_AUX_DIR([script]) +AM_INIT_AUTOMAKE([foreign parallel-tests]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])]) LT_INIT # Checks for programs. @@ -32,7 +33,11 @@ AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests], [enable testing the build] if test "x$enable_tests" = "xyes"; then AC_PROG_CC AC_PROG_AWK + # test need minitest gem AC_PATH_PROG(RUBY, [ruby]) + AC_PATH_PROG(TAPOUT, [tapout]) + AC_REQUIRE_AUX_FILE([tap-driver]) + AC_REQUIRE_AUX_FILE([tap-runner]) AC_ARG_WITH(sassc-dir, AS_HELP_STRING([--with-sassc-dir=], [specify directory of sassc sources for testing (default: sassc)]), [sassc_dir="$withval"], [sassc_dir="sassc"]) @@ -64,9 +69,21 @@ the --with-sass-spec-dir= argument. ;; esac AC_SUBST(SASS_SPEC_PATH) + + # TODO: Remove this when automake requirements are 1.12+ + AC_MSG_CHECKING([whether we can use TAP mode]) + tmp=`$AWK '/TEST_LOG_DRIVER/' $srcdir/Makefile.in` + if test "x$tmp" != "x"; then + use_tap=yes + else + use_tap=no + fi + AC_MSG_RESULT([$use_tap]) + fi AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xyes") +AM_CONDITIONAL(USE_TAP, test "x$use_tap" = "xyes") AC_ARG_ENABLE([coverage], [AS_HELP_STRING([--enable-coverage], @@ -93,18 +110,13 @@ AC_ARG_VAR(LIBSASS_VERSION, libsass version) if test "x$LIBSASS_VERSION" = "x"; then AC_CHECK_PROG(GIT, git, git) if test "x$GIT" = "x"; then - AC_MSG_ERROR([Unable to find git binary to query version. -You can solve this by setting LIBSASS_VERSION: -# export LIBSASS_VERSION="x.y.z" -]) + LIBSASS_VERSION=$VERSION else - AC_CHECK_FILE(.git/config, [], [ - AC_MSG_ERROR([Unable to find .git directory to query version. -You can solve this by setting LIBSASS_VERSION: -# export LIBSASS_VERSION="x.y.z" -]) + AC_CHECK_FILE(.git/config, [ + LIBSASS_VERSION=`$GIT describe --abbrev=4 --dirty --always --tags` + ], [ + LIBSASS_VERSION=$VERSION ]) - LIBSASS_VERSION=`$GIT describe --abbrev=4 --dirty --always --tags` fi if test "x$LIBSASS_VERSION" = "x"; then AC_MSG_ERROR([LIBSASS_VERSION not defined. diff --git a/script/ci-install-compiler b/script/ci-install-compiler index 7a31f6a017..169cc4e5a0 100755 --- a/script/ci-install-compiler +++ b/script/ci-install-compiler @@ -1,3 +1,4 @@ #!/bin/bash gem install minitest +gem install minitap diff --git a/script/ci-install-deps b/script/ci-install-deps index 3df7a42cf3..ed5a300df1 100755 --- a/script/ci-install-deps +++ b/script/ci-install-deps @@ -10,3 +10,10 @@ if [ "x$COVERAGE" == "xyes" ]; then else echo "no dependencies to install" fi + +if [ "x$AUTOTOOLS" == "xyes" ]; then + sudo add-apt-repository -y ppa:rbose-debianizer/automake &> /dev/null + sudo apt-get -qq update + sudo apt-get -qq install automake + AUTOTOOLS=yes +fi \ No newline at end of file diff --git a/script/tap-driver b/script/tap-driver new file mode 100755 index 0000000000..19aa531dee --- /dev/null +++ b/script/tap-driver @@ -0,0 +1,652 @@ +#! /bin/sh +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +scriptversion=2011-12-27.17; # UTC + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +me=tap-driver.sh + +fatal () +{ + echo "$me: fatal: $*" >&2 + exit 1 +} + +usage_error () +{ + echo "$me: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat < + # + trap : 1 3 2 13 15 + if test $merge -gt 0; then + exec 2>&1 + else + exec 2>&3 + fi + "$@" + echo $? + ) | LC_ALL=C ${AM_TAP_AWK-awk} \ + -v me="$me" \ + -v test_script_name="$test_name" \ + -v log_file="$log_file" \ + -v trs_file="$trs_file" \ + -v expect_failure="$expect_failure" \ + -v merge="$merge" \ + -v ignore_exit="$ignore_exit" \ + -v comments="$comments" \ + -v diag_string="$diag_string" \ +' +# FIXME: the usages of "cat >&3" below could be optimized when using +# FIXME: GNU awk, and/on on systems that supports /dev/fd/. + +# Implementation note: in what follows, `result_obj` will be an +# associative array that (partly) simulates a TAP result object +# from the `TAP::Parser` perl module. + +## ----------- ## +## FUNCTIONS ## +## ----------- ## + +function fatal(msg) +{ + print me ": " msg | "cat >&2" + exit 1 +} + +function abort(where) +{ + fatal("internal error " where) +} + +# Convert a boolean to a "yes"/"no" string. +function yn(bool) +{ + return bool ? "yes" : "no"; +} + +function add_test_result(result) +{ + if (!test_results_index) + test_results_index = 0 + test_results_list[test_results_index] = result + test_results_index += 1 + test_results_seen[result] = 1; +} + +# Whether the test script should be re-run by "make recheck". +function must_recheck() +{ + for (k in test_results_seen) + if (k != "XFAIL" && k != "PASS" && k != "SKIP") + return 1 + return 0 +} + +# Whether the content of the log file associated to this test should +# be copied into the "global" test-suite.log. +function copy_in_global_log() +{ + for (k in test_results_seen) + if (k != "PASS") + return 1 + return 0 +} + +# FIXME: this can certainly be improved ... +function get_global_test_result() +{ + if ("ERROR" in test_results_seen) + return "ERROR" + if ("FAIL" in test_results_seen || "XPASS" in test_results_seen) + return "FAIL" + all_skipped = 1 + for (k in test_results_seen) + if (k != "SKIP") + all_skipped = 0 + if (all_skipped) + return "SKIP" + return "PASS"; +} + +function stringify_result_obj(result_obj) +{ + if (result_obj["is_unplanned"] || result_obj["number"] != testno) + return "ERROR" + + if (plan_seen == LATE_PLAN) + return "ERROR" + + if (result_obj["directive"] == "TODO") + return result_obj["is_ok"] ? "XPASS" : "XFAIL" + + if (result_obj["directive"] == "SKIP") + return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL; + + if (length(result_obj["directive"])) + abort("in function stringify_result_obj()") + + return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL +} + +function decorate_result(result) +{ + color_name = color_for_result[result] + if (color_name) + return color_map[color_name] "" result "" color_map["std"] + # If we are not using colorized output, or if we do not know how + # to colorize the given result, we should return it unchanged. + return result +} + +function report(result, details) +{ + if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/) + { + msg = ": " test_script_name + add_test_result(result) + } + else if (result == "#") + { + msg = " " test_script_name ":" + } + else + { + abort("in function report()") + } + if (length(details)) + msg = msg " " details + # Output on console might be colorized. + print decorate_result(result) msg + # Log the result in the log file too, to help debugging (this is + # especially true when said result is a TAP error or "Bail out!"). + print result msg | "cat >&3"; +} + +function testsuite_error(error_message) +{ + report("ERROR", "- " error_message) +} + +function handle_tap_result() +{ + details = result_obj["number"]; + if (length(result_obj["description"])) + details = details " " result_obj["description"] + + if (plan_seen == LATE_PLAN) + { + details = details " # AFTER LATE PLAN"; + } + else if (result_obj["is_unplanned"]) + { + details = details " # UNPLANNED"; + } + else if (result_obj["number"] != testno) + { + details = sprintf("%s # OUT-OF-ORDER (expecting %d)", + details, testno); + } + else if (result_obj["directive"]) + { + details = details " # " result_obj["directive"]; + if (length(result_obj["explanation"])) + details = details " " result_obj["explanation"] + } + + report(stringify_result_obj(result_obj), details) +} + +# `skip_reason` should be empty whenever planned > 0. +function handle_tap_plan(planned, skip_reason) +{ + planned += 0 # Avoid getting confused if, say, `planned` is "00" + if (length(skip_reason) && planned > 0) + abort("in function handle_tap_plan()") + if (plan_seen) + { + # Error, only one plan per stream is acceptable. + testsuite_error("multiple test plans") + return; + } + planned_tests = planned + # The TAP plan can come before or after *all* the TAP results; we speak + # respectively of an "early" or a "late" plan. If we see the plan line + # after at least one TAP result has been seen, assume we have a late + # plan; in this case, any further test result seen after the plan will + # be flagged as an error. + plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN) + # If testno > 0, we have an error ("too many tests run") that will be + # automatically dealt with later, so do not worry about it here. If + # $plan_seen is true, we have an error due to a repeated plan, and that + # has already been dealt with above. Otherwise, we have a valid "plan + # with SKIP" specification, and should report it as a particular kind + # of SKIP result. + if (planned == 0 && testno == 0) + { + if (length(skip_reason)) + skip_reason = "- " skip_reason; + report("SKIP", skip_reason); + } +} + +function extract_tap_comment(line) +{ + if (index(line, diag_string) == 1) + { + # Strip leading `diag_string` from `line`. + line = substr(line, length(diag_string) + 1) + # And strip any leading and trailing whitespace left. + sub("^[ \t]*", "", line) + sub("[ \t]*$", "", line) + # Return what is left (if any). + return line; + } + return ""; +} + +# When this function is called, we know that line is a TAP result line, +# so that it matches the (perl) RE "^(not )?ok\b". +function setup_result_obj(line) +{ + # Get the result, and remove it from the line. + result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0) + sub("^(not )?ok[ \t]*", "", line) + + # If the result has an explicit number, get it and strip it; otherwise, + # automatically assing the next progresive number to it. + if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/) + { + match(line, "^[0-9]+") + # The final `+ 0` is to normalize numbers with leading zeros. + result_obj["number"] = substr(line, 1, RLENGTH) + 0 + line = substr(line, RLENGTH + 1) + } + else + { + result_obj["number"] = testno + } + + if (plan_seen == LATE_PLAN) + # No further test results are acceptable after a "late" TAP plan + # has been seen. + result_obj["is_unplanned"] = 1 + else if (plan_seen && testno > planned_tests) + result_obj["is_unplanned"] = 1 + else + result_obj["is_unplanned"] = 0 + + # Strip trailing and leading whitespace. + sub("^[ \t]*", "", line) + sub("[ \t]*$", "", line) + + # This will have to be corrected if we have a "TODO"/"SKIP" directive. + result_obj["description"] = line + result_obj["directive"] = "" + result_obj["explanation"] = "" + + if (index(line, "#") == 0) + return # No possible directive, nothing more to do. + + # Directives are case-insensitive. + rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*" + + # See whether we have the directive, and if yes, where. + pos = match(line, rx "$") + if (!pos) + pos = match(line, rx "[^a-zA-Z0-9_]") + + # If there was no TAP directive, we have nothing more to do. + if (!pos) + return + + # Let`s now see if the TAP directive has been escaped. For example: + # escaped: ok \# SKIP + # not escaped: ok \\# SKIP + # escaped: ok \\\\\# SKIP + # not escaped: ok \ # SKIP + if (substr(line, pos, 1) == "#") + { + bslash_count = 0 + for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--) + bslash_count += 1 + if (bslash_count % 2) + return # Directive was escaped. + } + + # Strip the directive and its explanation (if any) from the test + # description. + result_obj["description"] = substr(line, 1, pos - 1) + # Now remove the test description from the line, that has been dealt + # with already. + line = substr(line, pos) + # Strip the directive, and save its value (normalized to upper case). + sub("^[ \t]*#[ \t]*", "", line) + result_obj["directive"] = toupper(substr(line, 1, 4)) + line = substr(line, 5) + # Now get the explanation for the directive (if any), with leading + # and trailing whitespace removed. + sub("^[ \t]*", "", line) + sub("[ \t]*$", "", line) + result_obj["explanation"] = line +} + +function get_test_exit_message(status) +{ + if (status == 0) + return "" + if (status !~ /^[1-9][0-9]*$/) + abort("getting exit status") + if (status < 127) + exit_details = "" + else if (status == 127) + exit_details = " (command not found?)" + else if (status >= 128 && status <= 255) + exit_details = sprintf(" (terminated by signal %d?)", status - 128) + else if (status > 256 && status <= 384) + # We used to report an "abnormal termination" here, but some Korn + # shells, when a child process die due to signal number n, can leave + # in $? an exit status of 256+n instead of the more standard 128+n. + # Apparently, both behaviours are allowed by POSIX (2008), so be + # prepared to handle them both. See also Austing Group report ID + # 0000051 + exit_details = sprintf(" (terminated by signal %d?)", status - 256) + else + # Never seen in practice. + exit_details = " (abnormal termination)" + return sprintf("exited with status %d%s", status, exit_details) +} + +function write_test_results() +{ + print ":global-test-result: " get_global_test_result() > trs_file + print ":recheck: " yn(must_recheck()) > trs_file + print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file + for (i = 0; i < test_results_index; i += 1) + print ":test-result: " test_results_list[i] > trs_file + close(trs_file); +} + +BEGIN { + +## ------- ## +## SETUP ## +## ------- ## + +'"$init_colors"' + +# Properly initialized once the TAP plan is seen. +planned_tests = 0 + +COOKED_PASS = expect_failure ? "XPASS": "PASS"; +COOKED_FAIL = expect_failure ? "XFAIL": "FAIL"; + +# Enumeration-like constants to remember which kind of plan (if any) +# has been seen. It is important that NO_PLAN evaluates "false" as +# a boolean. +NO_PLAN = 0 +EARLY_PLAN = 1 +LATE_PLAN = 2 + +testno = 0 # Number of test results seen so far. +bailed_out = 0 # Whether a "Bail out!" directive has been seen. + +# Whether the TAP plan has been seen or not, and if yes, which kind +# it is ("early" is seen before any test result, "late" otherwise). +plan_seen = NO_PLAN + +## --------- ## +## PARSING ## +## --------- ## + +is_first_read = 1 + +while (1) + { + # Involutions required so that we are able to read the exit status + # from the last input line. + st = getline + if (st < 0) # I/O error. + fatal("I/O error while reading from input stream") + else if (st == 0) # End-of-input + { + if (is_first_read) + abort("in input loop: only one input line") + break + } + if (is_first_read) + { + is_first_read = 0 + nextline = $0 + continue + } + else + { + curline = nextline + nextline = $0 + $0 = curline + } + # Copy any input line verbatim into the log file. + print | "cat >&3" + # Parsing of TAP input should stop after a "Bail out!" directive. + if (bailed_out) + continue + + # TAP test result. + if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/) + { + testno += 1 + setup_result_obj($0) + handle_tap_result() + } + # TAP plan (normal or "SKIP" without explanation). + else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/) + { + # The next two lines will put the number of planned tests in $0. + sub("^1\\.\\.", "") + sub("[^0-9]*$", "") + handle_tap_plan($0, "") + continue + } + # TAP "SKIP" plan, with an explanation. + else if ($0 ~ /^1\.\.0+[ \t]*#/) + { + # The next lines will put the skip explanation in $0, stripping + # any leading and trailing whitespace. This is a little more + # tricky in truth, since we want to also strip a potential leading + # "SKIP" string from the message. + sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "") + sub("[ \t]*$", ""); + handle_tap_plan(0, $0) + } + # "Bail out!" magic. + # Older versions of prove and TAP::Harness (e.g., 3.17) did not + # recognize a "Bail out!" directive when preceded by leading + # whitespace, but more modern versions (e.g., 3.23) do. So we + # emulate the latter, "more modern" behaviour. + else if ($0 ~ /^[ \t]*Bail out!/) + { + bailed_out = 1 + # Get the bailout message (if any), with leading and trailing + # whitespace stripped. The message remains stored in `$0`. + sub("^[ \t]*Bail out![ \t]*", ""); + sub("[ \t]*$", ""); + # Format the error message for the + bailout_message = "Bail out!" + if (length($0)) + bailout_message = bailout_message " " $0 + testsuite_error(bailout_message) + } + # Maybe we have too look for dianogtic comments too. + else if (comments != 0) + { + comment = extract_tap_comment($0); + if (length(comment)) + report("#", comment); + } + } + +## -------- ## +## FINISH ## +## -------- ## + +# A "Bail out!" directive should cause us to ignore any following TAP +# error, as well as a non-zero exit status from the TAP producer. +if (!bailed_out) + { + if (!plan_seen) + { + testsuite_error("missing test plan") + } + else if (planned_tests != testno) + { + bad_amount = testno > planned_tests ? "many" : "few" + testsuite_error(sprintf("too %s tests run (expected %d, got %d)", + bad_amount, planned_tests, testno)) + } + if (!ignore_exit) + { + # Fetch exit status from the last line. + exit_message = get_test_exit_message(nextline) + if (exit_message) + testsuite_error(exit_message) + } + } + +write_test_results() + +exit 0 + +} # End of "BEGIN" block. +' + +# TODO: document that we consume the file descriptor 3 :-( +} 3>"$log_file" + +test $? -eq 0 || fatal "I/O or internal error" + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/script/tap-runner b/script/tap-runner new file mode 100755 index 0000000000..4adecafb97 --- /dev/null +++ b/script/tap-runner @@ -0,0 +1 @@ +$@ | tapout tap \ No newline at end of file