CVS commit: src/external/bsd/atf/dist/tools
Module Name:src
Committed By: gson
Date: Thu Jul 8 18:10:52 UTC 2021
Modified Files:
src/external/bsd/atf/dist/tools: atf-run.cpp
Log Message:
When running an individual test case under isolation, make the test
case count on the tp-start line of the output match the number of test
cases actually executed (one) so that the atf-run output is valid
input to atf-report.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/tools/atf-run.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/atf-run.cpp
diff -u src/external/bsd/atf/dist/tools/atf-run.cpp:1.6 src/external/bsd/atf/dist/tools/atf-run.cpp:1.7
--- src/external/bsd/atf/dist/tools/atf-run.cpp:1.6 Sat Apr 10 10:32:57 2021
+++ src/external/bsd/atf/dist/tools/atf-run.cpp Thu Jul 8 18:10:52 2021
@@ -388,7 +388,22 @@ atf_run::run_test_program(const tools::f
tools::fs::temp_dir resdir(
tools::fs::path(tools::config::get("atf_workdir")) / "atf-run.XX");
-w.start_tp(tp.str(), md.test_cases.size());
+size_t nseltcs;
+if (tc.empty()) {
+nseltcs = md.test_cases.size();
+} else {
+nseltcs = 0;
+for (std::map< std::string, vars_map >::const_iterator iter
+ = md.test_cases.begin(); iter != md.test_cases.end(); iter++) {
+const std::string& tcname = (*iter).first;
+if (tcname == tc)
+nseltcs++;
+}
+if (nseltcs == 0)
+throw std::runtime_error("No such test case");
+}
+
+w.start_tp(tp.str(), nseltcs);
if (md.test_cases.empty()) {
w.end_tp("Bogus test program: reported 0 test cases");
errcode = EXIT_FAILURE;
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src
Committed By: gson
Date: Sat Apr 10 10:32:57 UTC 2021
Modified Files:
src/external/bsd/atf/dist/tools: atf-run.1 atf-run.cpp
Log Message:
Add support for running individual test cases under isolation.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-run.1
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/tools/atf-run.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/atf-run.1
diff -u src/external/bsd/atf/dist/tools/atf-run.1:1.4 src/external/bsd/atf/dist/tools/atf-run.1:1.5
--- src/external/bsd/atf/dist/tools/atf-run.1:1.4 Sat Feb 8 19:13:44 2014
+++ src/external/bsd/atf/dist/tools/atf-run.1 Sat Apr 10 10:32:57 2021
@@ -26,23 +26,22 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd November 1, 2010
+.Dd April 10, 2021
.Dt ATF-RUN 1
.Os
.Sh NAME
.Nm atf-run
-.Nd executes a collection of test programs
+.Nd executes a collection of tests
.Sh SYNOPSIS
.Nm
.Op Fl v Ar var1=value1 Op .. Fl v Ar varN=valueN
-.Op Ar test_program1 Op Ar .. test_programN
+.Op Ar test1 Op Ar .. testN
.Nm
.Fl h
.Sh DESCRIPTION
.Nm
-executes a collection of test programs or, in other words, a complete
-test suite.
-The results of each test program are collected by the tool, and are then
+executes a collection of test cases, test programs, or a complete test suite.
+The results of each test are collected by the tool, and are then
multiplexed into a single machine-parseable report; see
.Xr atf-formats 5
for more details.
@@ -70,8 +69,14 @@ In the first synopsis form,
parses the
.Pa Atffile
in the current directory and runs all the test programs specified in it.
-If any test program names are given as part of the command line, those are
-the ones executed instead of the complete list.
+If any
+.Ar test
+arguments are given as part of the command line, those tests are
+executed instead of the complete list. Each
+.Ar test
+argument can be either the name of a test program, or a string of the form
+.Ar test_program:test_case
+to execute a single test case.
.Pp
In the second synopsis form,
.Nm
Index: src/external/bsd/atf/dist/tools/atf-run.cpp
diff -u src/external/bsd/atf/dist/tools/atf-run.cpp:1.5 src/external/bsd/atf/dist/tools/atf-run.cpp:1.6
--- src/external/bsd/atf/dist/tools/atf-run.cpp:1.5 Tue Feb 11 18:13:45 2014
+++ src/external/bsd/atf/dist/tools/atf-run.cpp Sat Apr 10 10:32:57 2021
@@ -81,11 +81,13 @@ class atf_run : public tools::applicatio
size_t count_tps(std::vector< std::string >) const;
-int run_test(const tools::fs::path&, tools::test_program::atf_tps_writer&,
+int run_test(const tools::fs::path&, const std::string &,
+ tools::test_program::atf_tps_writer&,
const vars_map&);
int run_test_directory(const tools::fs::path&,
tools::test_program::atf_tps_writer&);
int run_test_program(const tools::fs::path&,
+ const std::string tc,
tools::test_program::atf_tps_writer&,
const vars_map&);
@@ -179,7 +181,7 @@ std::string
atf_run::specific_args(void)
const
{
-return "[test-program1 .. test-programN]";
+return "[test1 .. testN]";
}
atf_run::options_set
@@ -214,6 +216,7 @@ atf_run::parse_vflag(const std::string&
int
atf_run::run_test(const tools::fs::path& tp,
+ const std::string ,
tools::test_program::atf_tps_writer& w,
const vars_map& config)
{
@@ -226,7 +229,7 @@ atf_run::run_test(const tools::fs::path&
const vars_map effective_config =
tools::config_file::merge_configs(config, m_cmdline_vars);
-errcode = run_test_program(tp, w, effective_config);
+errcode = run_test_program(tp, tc, w, effective_config);
}
return errcode;
}
@@ -247,7 +250,7 @@ atf_run::run_test_directory(const tools:
bool ok = true;
for (std::vector< std::string >::const_iterator iter = af.tps().begin();
iter != af.tps().end(); iter++) {
-const bool result = run_test(tp / *iter, w,
+const bool result = run_test(tp / *iter, "", w,
tools::config_file::merge_configs(af.conf(), test_suite_vars));
ok &= (result == EXIT_SUCCESS);
}
@@ -362,6 +365,7 @@ atf_run::get_test_case_result(const std:
int
atf_run::run_test_program(const tools::fs::path& tp,
+ const std::string tc,
tools::test_program::atf_tps_writer& w,
const vars_map& config)
{
@@ -394,6 +398,9 @@ atf_run::run_test_program(const tools::f
const std::string& tcname = (*iter).first;
const vars_map& tcmd = (*iter).second;
+
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src
Committed By: christos
Date: Sun Mar 28 16:35:37 UTC 2021
Modified Files:
src/external/bsd/atf/dist/tools: fs.cpp fs.hpp test-program.cpp
Log Message:
If we are running the test as an unprivileged user, hand ownership of the
test directory to that user.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/fs.cpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/tools/fs.hpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/tools/test-program.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/fs.cpp
diff -u src/external/bsd/atf/dist/tools/fs.cpp:1.4 src/external/bsd/atf/dist/tools/fs.cpp:1.5
--- src/external/bsd/atf/dist/tools/fs.cpp:1.4 Sat Nov 11 09:16:06 2017
+++ src/external/bsd/atf/dist/tools/fs.cpp Sun Mar 28 12:35:37 2021
@@ -683,6 +683,17 @@ impl::rmdir(const path& p)
}
}
+void
+impl::change_ownership(const path& p, const std::pair < int, int >& user)
+{
+if (::chown(p.c_str(), user.first, user.second) == -1) {
+std::stringstream ss;
+ss << IMPL_NAME "::chown(" << p.str() << ", " << user.first << ", "
+ << user.second << ")";
+throw tools::system_error(ss.str(), "chown(2) failed", errno);
+}
+}
+
impl::path
impl::change_directory(const path& dir)
{
Index: src/external/bsd/atf/dist/tools/fs.hpp
diff -u src/external/bsd/atf/dist/tools/fs.hpp:1.2 src/external/bsd/atf/dist/tools/fs.hpp:1.3
--- src/external/bsd/atf/dist/tools/fs.hpp:1.2 Mon Mar 9 16:34:52 2020
+++ src/external/bsd/atf/dist/tools/fs.hpp Sun Mar 28 12:35:37 2021
@@ -368,6 +368,7 @@ void remove(const path&);
void rmdir(const path&);
tools::fs::path change_directory(const tools::fs::path&);
+void change_ownership(const tools::fs::path&, const std::pair< int, int >&);
void cleanup(const tools::fs::path&);
tools::fs::path get_current_dir(void);
Index: src/external/bsd/atf/dist/tools/test-program.cpp
diff -u src/external/bsd/atf/dist/tools/test-program.cpp:1.3 src/external/bsd/atf/dist/tools/test-program.cpp:1.4
--- src/external/bsd/atf/dist/tools/test-program.cpp:1.3 Wed Dec 30 17:23:38 2015
+++ src/external/bsd/atf/dist/tools/test-program.cpp Sun Mar 28 12:35:37 2021
@@ -304,8 +304,10 @@ run_test_case_child(void* raw_params)
const std::pair< int, int > user = tools::get_required_user(
params->metadata, params->config);
-if (user.first != -1 && user.second != -1)
+if (user.first != -1 && user.second != -1) {
+tools::fs::change_ownership(params->workdir, user);
tools::user::drop_privileges(user);
+}
// The input 'tp' parameter may be relative and become invalid once
// we change the current working directory.
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: kre
Date: Thu Sep 10 22:51:11 UTC 2020
Modified Files:
src/external/bsd/atf/dist/atf-sh: libatf-sh.subr
Log Message:
Replace a pipe into tr to normalise a var name (convert '.' or '-'
into '_' to meet sh variable name rules) into a shell string processing
loop.
On my test system, this reduces the total elapsed time for the bin/sh ATF
tests from about 109 secs to about 102 (user cpu from 24.5 to 21, sys cpu
from 34 to 30) and the usr.bin/make tests elapsed time from 42.5 to 40
secs (user from a bit over 15 to a bit over 13, and sys from 16+ to 13+).
(Recorded on an AMD64 domU).
These probably exaggerate the effect, as there are a bunch of quite small
tests, which means the ATF overhead (which this change affects) is a greater
proportion of the total test time than for some other tests where most of
the time is spent actually testing.
But I am fairly confident that there will be at least some improvement.
This could be further improved by removing the cmdsub invocation method,
and instead passing the name of a variable containing the string to
normalise (with the result returned in that same var) - but that would
mean altering all the callers as well. Some other time maybe.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
diff -u src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.4 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.5
--- src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.4 Wed Dec 30 22:23:02 2015
+++ src/external/bsd/atf/dist/atf-sh/libatf-sh.subr Thu Sep 10 22:51:10 2020
@@ -544,7 +544,15 @@ _atf_list_tcs()
#
_atf_normalize()
{
-echo ${1} | tr .- __
+while :
+do
+ case "${1}" in
+ (*.*) set -- "${1%.*}_${1##*.}";;
+ (*-*) set -- "${1%-*}_${1##*-}";;
+ (*) break;;
+ esac
+done
+printf "%s\n" "$1"
}
#
CVS commit: src/external/bsd/atf/dist/atf-c
Module Name:src Committed By: pgoyette Date: Fri Jul 3 19:22:39 UTC 2020 Modified Files: src/external/bsd/atf/dist/atf-c: atf-c-api.3 Log Message: Consistent use of comma in lists. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/atf-c-api.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/atf-c-api.3 diff -u src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.4 src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.5 --- src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.4 Sat Feb 8 19:13:43 2014 +++ src/external/bsd/atf/dist/atf-c/atf-c-api.3 Fri Jul 3 19:22:38 2020 @@ -276,15 +276,15 @@ In order to do so, a later registration macro detailed in .Sx Program initialization . .Pp -Later on, one must define the three parts of the body by means of three +Later on, one must define the three parts of the test by means of three functions. Their headers are given by the .Fn ATF_TC_HEAD , -.Fn ATF_TC_BODY +.Fn ATF_TC_BODY , and .Fn ATF_TC_CLEANUP macros, all of which take the test case name provided to the -.Fn ATF_TC +.Fn ATF_TC , .Fn ATF_TC_WITH_CLEANUP , or .Fn ATF_TC_WITHOUT_HEAD
CVS commit: src/external/bsd/atf/tests/atf
Module Name:src
Committed By: lukem
Date: Sun Jun 21 13:59:56 UTC 2020
Modified Files:
src/external/bsd/atf/tests/atf/test-programs: Makefile
src/external/bsd/atf/tests/atf/tools: Makefile
Log Message:
fix build of atf .cpp files
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/atf/tests/atf/test-programs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/tests/atf/test-programs/Makefile
diff -u src/external/bsd/atf/tests/atf/test-programs/Makefile:1.6 src/external/bsd/atf/tests/atf/test-programs/Makefile:1.7
--- src/external/bsd/atf/tests/atf/test-programs/Makefile:1.6 Sat Feb 15 04:15:20 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Makefile Sun Jun 21 13:59:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/02/15 04:15:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2020/06/21 13:59:56 lukem Exp $
.include
@@ -11,6 +11,7 @@ KYUAFILE= yes
TESTS_C= c_helpers
TESTS_CXX= cpp_helpers
+SRCS.cpp_helpers=cpp_helpers.cpp
TESTS_SH= sh_helpers
.for t in config_test expect_test meta_data_test result_test srcdir_test
Index: src/external/bsd/atf/tests/atf/tools/Makefile
diff -u src/external/bsd/atf/tests/atf/tools/Makefile:1.7 src/external/bsd/atf/tests/atf/tools/Makefile:1.8
--- src/external/bsd/atf/tests/atf/tools/Makefile:1.7 Sat Feb 15 22:32:26 2014
+++ src/external/bsd/atf/tests/atf/tools/Makefile Sun Jun 21 13:59:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/02/15 22:32:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/21 13:59:56 lukem Exp $
USE_ATF_LIBTOOLS= yes
@@ -23,7 +23,9 @@ TESTS_C= expect_helpers \
several_tcs_helper \
zero_tcs_helper
-TESTS_CXX= application_test \
+TESTS_CXX=
+.for test in \
+ application_test \
atffile_test \
auto_array_test \
config_file_test \
@@ -44,6 +46,9 @@ TESTS_CXX= application_test \
text_test \
ui_test \
user_test
+TESTS_CXX+= ${test}
+SRCS.${test}= ${test}.cpp
+.endfor
TESTS_SH= atf-config_test \
atf-report_test \
CVS commit: src/external/bsd/atf/lib/libatf-c
Module Name:src
Committed By: fox
Date: Sun Jun 7 23:09:34 UTC 2020
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile
Log Message:
external/bsd/atf: Suppress -Werror=stringop-truncation error
This logic correctly uses strncpy(3) to fully initialize a fixed-width field,
and also ensures
NUL-termination on the next line as other users of the field expect.
Add -Werror=stringop-truncation to prevent build failure, when run with
MKSANITIZER=yes.
Error was reported when build.sh was run with MKSANITIZER=yes flag.
Reviewed by: kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/atf/lib/libatf-c/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.22 src/external/bsd/atf/lib/libatf-c/Makefile:1.23
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.22 Wed Jan 29 22:40:44 2020
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Jun 7 23:09:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/01/29 22:40:44 christos Exp $
+# $NetBSD: Makefile,v 1.23 2020/06/07 23:09:34 fox Exp $
NOLINT= # defined
@@ -54,6 +54,7 @@ INCSDIR_atf-c.h=/usr/include
MAN= atf-c-api.3
COPTS.tc.c+= ${${ACTIVE_CC} == "clang" && ${MACHINE_ARCH} == "powerpc":? -O0 :}
+COPTS.fs.c+= ${GCC_NO_STRINGOP_TRUNCATION}
.if ${MKSHARE} != "no"
FILES+= atf-c.pc
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src Committed By: christos Date: Thu Apr 23 16:05:16 UTC 2020 Modified Files: src/external/bsd/atf/dist/tools: env.cpp Log Message: Add the system binary paths too since tests use them. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/tools/env.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/tools/env.cpp diff -u src/external/bsd/atf/dist/tools/env.cpp:1.3 src/external/bsd/atf/dist/tools/env.cpp:1.4 --- src/external/bsd/atf/dist/tools/env.cpp:1.3 Mon Mar 30 21:02:18 2020 +++ src/external/bsd/atf/dist/tools/env.cpp Thu Apr 23 12:05:15 2020 @@ -53,7 +53,7 @@ impl::get(const std::string& name) if (val != NULL) return val; if (strcmp(n, "PATH") == 0) - return "/bin:/usr/bin"; + return "/bin:/usr/bin:/sbin:/usr/sbin"; throw tools::system_error(IMPL_NAME "::set", "Cannot get environment variable '" + name +
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src
Committed By: christos
Date: Tue Mar 31 01:02:18 UTC 2020
Modified Files:
src/external/bsd/atf/dist/tools: env.cpp
Log Message:
Allow env - atf-run to work by setting a default minimal path.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/tools/env.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/env.cpp
diff -u src/external/bsd/atf/dist/tools/env.cpp:1.2 src/external/bsd/atf/dist/tools/env.cpp:1.3
--- src/external/bsd/atf/dist/tools/env.cpp:1.2 Tue Feb 11 12:28:20 2014
+++ src/external/bsd/atf/dist/tools/env.cpp Mon Mar 30 21:02:18 2020
@@ -48,9 +48,16 @@ namespace impl = tools::env;
std::string
impl::get(const std::string& name)
{
-const char* val = getenv(name.c_str());
-assert(val != NULL);
-return val;
+const char *n =name.c_str();
+const char* val = getenv(n);
+if (val != NULL)
+ return val;
+if (strcmp(n, "PATH") == 0)
+ return "/bin:/usr/bin";
+
+throw tools::system_error(IMPL_NAME "::set",
+ "Cannot get environment variable '" + name +
+ "'", errno);
}
bool
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: christos
Date: Mon Mar 9 20:34:52 UTC 2020
Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/dist/atf-c++: check.cpp check.hpp check_test.cpp
tests.hpp
src/external/bsd/atf/dist/atf-c++/detail: process_test.cpp
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
src/external/bsd/atf/dist/tools: atf-report.cpp atffile_test.cpp fs.hpp
io.hpp parser.hpp process_test.cpp timers.hpp
Log Message:
remove -std=gnu++98
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/atf/dist/atf-c++/check.cpp
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/atf/dist/atf-c++/check.hpp
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/atf/dist/atf-c++/check_test.cpp
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/dist/atf-c++/tests.hpp
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-report.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/atffile_test.cpp \
src/external/bsd/atf/dist/tools/fs.hpp \
src/external/bsd/atf/dist/tools/io.hpp \
src/external/bsd/atf/dist/tools/parser.hpp \
src/external/bsd/atf/dist/tools/process_test.cpp \
src/external/bsd/atf/dist/tools/timers.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.6 src/external/bsd/atf/Makefile.inc:1.7
--- src/external/bsd/atf/Makefile.inc:1.6 Sat Feb 3 20:41:05 2018
+++ src/external/bsd/atf/Makefile.inc Mon Mar 9 16:34:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2018/02/04 01:41:05 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2020/03/09 20:34:52 christos Exp $
.include
@@ -41,8 +41,6 @@ CPPFLAGS+= -I${TOPDIR} # For bconfig.h
CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For atf-c/defs.hpp.
CPPFLAGS+= -I${SRCDIR}
-CXXFLAGS+= -std=gnu++98
-
.if defined(USE_ATF_LIBTOOLS)
LIBTOOLSOBJDIR!= cd ${TOPDIR}/lib/tools; ${PRINTOBJDIR}
CPPFLAGS+= -I${LIBTOOLSOBJDIR}
Index: src/external/bsd/atf/dist/atf-c++/check.cpp
diff -u src/external/bsd/atf/dist/atf-c++/check.cpp:1.1.1.6 src/external/bsd/atf/dist/atf-c++/check.cpp:1.2
--- src/external/bsd/atf/dist/atf-c++/check.cpp:1.1.1.6 Mon Jan 16 17:36:43 2012
+++ src/external/bsd/atf/dist/atf-c++/check.cpp Mon Mar 9 16:34:52 2020
@@ -145,7 +145,7 @@ impl::build_cxx_o(const std::string& sfi
return success;
}
-std::auto_ptr< impl::check_result >
+std::unique_ptr< impl::check_result >
impl::exec(const atf::process::argv_array& argva)
{
atf_check_result_t result;
@@ -154,5 +154,5 @@ impl::exec(const atf::process::argv_arra
if (atf_is_error(err))
throw_atf_error(err);
-return std::auto_ptr< impl::check_result >(new impl::check_result());
+return std::unique_ptr< impl::check_result >(new impl::check_result());
}
Index: src/external/bsd/atf/dist/atf-c++/check.hpp
diff -u src/external/bsd/atf/dist/atf-c++/check.hpp:1.1.1.8 src/external/bsd/atf/dist/atf-c++/check.hpp:1.2
--- src/external/bsd/atf/dist/atf-c++/check.hpp:1.1.1.8 Sat Feb 8 14:11:31 2014
+++ src/external/bsd/atf/dist/atf-c++/check.hpp Mon Mar 9 16:34:52 2020
@@ -75,7 +75,7 @@ class check_result {
check_result(const atf_check_result_t* result);
friend check_result test_constructor(const char* const*);
-friend std::auto_ptr< check_result > exec(const atf::process::argv_array&);
+friend std::unique_ptr< check_result > exec(const atf::process::argv_array&);
public:
//!
@@ -124,7 +124,7 @@ bool build_cpp(const std::string&, const
const atf::process::argv_array&);
bool build_cxx_o(const std::string&, const std::string&,
const atf::process::argv_array&);
-std::auto_ptr< check_result > exec(const atf::process::argv_array&);
+std::unique_ptr< check_result > exec(const atf::process::argv_array&);
// Useful for testing only.
check_result test_constructor(void);
Index: src/external/bsd/atf/dist/atf-c++/check_test.cpp
diff -u src/external/bsd/atf/dist/atf-c++/check_test.cpp:1.1.1.7 src/external/bsd/atf/dist/atf-c++/check_test.cpp:1.2
--- src/external/bsd/atf/dist/atf-c++/check_test.cpp:1.1.1.7 Sat Feb 8 14:11:31 2014
+++ src/external/bsd/atf/dist/atf-c++/check_test.cpp Mon Mar 9 16:34:52 2020
@@ -57,7 +57,7 @@ extern "C" {
//
static
-std::auto_ptr< atf::check::check_result >
+std::unique_ptr< atf::check::check_result >
do_exec(const atf::tests::tc* tc, const char* helper_name)
{
std::vector< std::string > argv;
@@ -70,7 +70,7 @@ do_exec(const atf::tests::tc* tc, const
}
static
-std::auto_ptr<
CVS commit: src/external/bsd/atf/lib/libatf-c
Module Name:src
Committed By: christos
Date: Wed Jan 29 22:40:44 UTC 2020
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile
Log Message:
Hack for clang.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/atf/lib/libatf-c/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.21 src/external/bsd/atf/lib/libatf-c/Makefile:1.22
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.21 Sun Mar 2 17:50:13 2014
+++ src/external/bsd/atf/lib/libatf-c/Makefile Wed Jan 29 17:40:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/03/02 22:50:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2020/01/29 22:40:44 christos Exp $
NOLINT= # defined
@@ -53,6 +53,8 @@ INCSDIR_atf-c.h=/usr/include
MAN= atf-c-api.3
+COPTS.tc.c+= ${${ACTIVE_CC} == "clang" && ${MACHINE_ARCH} == "powerpc":? -O0 :}
+
.if ${MKSHARE} != "no"
FILES+= atf-c.pc
FILESDIR= /usr/lib/pkgconfig
CVS commit: src/external/bsd/atf/lib/tools
Module Name:src
Committed By: mrg
Date: Mon Feb 4 09:40:54 UTC 2019
Modified Files:
src/external/bsd/atf/lib/tools: Makefile
Log Message:
with GCC 7, apply -Wno-error=maybe-uninitialized to parser.cpp.
i don't really understand how to remove this warning, someone else
could though, so feel free to :-)
In file included from /usr/src/external/bsd/atf/dist/tools/parser.cpp:33:0:
/usr/src/external/bsd/atf/dist/tools/parser.hpp: In member function
'tools::parser::token tools::parser::tokenizer::next() [with IS =
std::basic_istream]':
/usr/src/external/bsd/atf/dist/tools/parser.hpp:98:8: warning:
'.tools::parser::token::m_line' may be used uninitialized in this
function [-Wmaybe-uninitialized]
struct token {
^
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/lib/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/tools/Makefile
diff -u src/external/bsd/atf/lib/tools/Makefile:1.5 src/external/bsd/atf/lib/tools/Makefile:1.6
--- src/external/bsd/atf/lib/tools/Makefile:1.5 Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/lib/tools/Makefile Mon Feb 4 09:40:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2019/02/04 09:40:54 mrg Exp $
NOLINT= # defined
@@ -36,4 +36,8 @@ SRCS= application.cpp \
ui.cpp \
user.cpp
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.parser.cpp += -Wno-error=maybe-uninitialized
+.endif
+
.include
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: mrg
Date: Sun Feb 4 01:41:05 UTC 2018
Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/dist/tools: process.cpp
Log Message:
ATF needs C++98 for now, and GCC 6.4 defaults to C++11.
fix a problem -Werror=misleading-indentation found but has zero
effect on the running code.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/process.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.5 src/external/bsd/atf/Makefile.inc:1.6
--- src/external/bsd/atf/Makefile.inc:1.5 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/Makefile.inc Sun Feb 4 01:41:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.6 2018/02/04 01:41:05 mrg Exp $
.include
@@ -41,6 +41,8 @@ CPPFLAGS+= -I${TOPDIR} # For bconfig.h
CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For atf-c/defs.hpp.
CPPFLAGS+= -I${SRCDIR}
+CXXFLAGS+= -std=gnu++98
+
.if defined(USE_ATF_LIBTOOLS)
LIBTOOLSOBJDIR!= cd ${TOPDIR}/lib/tools; ${PRINTOBJDIR}
CPPFLAGS+= -I${LIBTOOLSOBJDIR}
Index: src/external/bsd/atf/dist/tools/process.cpp
diff -u src/external/bsd/atf/dist/tools/process.cpp:1.4 src/external/bsd/atf/dist/tools/process.cpp:1.5
--- src/external/bsd/atf/dist/tools/process.cpp:1.4 Wed Dec 30 22:23:38 2015
+++ src/external/bsd/atf/dist/tools/process.cpp Sun Feb 4 01:41:05 2018
@@ -441,10 +441,12 @@ impl::child::~child(void)
::kill(m_pid, SIGTERM);
(void)wait();
-if (m_stdout != -1)
-::close(m_stdout);
-if (m_stderr != -1)
-::close(m_stderr);
+if (m_stdout != -1) {
+::close(m_stdout); m_stdout = -1;
+}
+if (m_stderr != -1) {
+::close(m_stderr); m_stderr = -1;
+}
}
}
@@ -457,10 +459,12 @@ impl::child::wait(void)
throw system_error(IMPL_NAME "::child::wait", "Failed waiting for "
"process " + text::to_string(m_pid), errno);
-if (m_stdout != -1)
+if (m_stdout != -1) {
::close(m_stdout); m_stdout = -1;
-if (m_stderr != -1)
+}
+if (m_stderr != -1) {
::close(m_stderr); m_stderr = -1;
+}
m_waited = true;
return status(s);
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src
Committed By: maya
Date: Sat Nov 11 14:16:06 UTC 2017
Modified Files:
src/external/bsd/atf/dist/tools: fs.cpp
Log Message:
don't use auto_ptr with memory allocated by C code
silences alloc-dealloc-mismatch warnings from asan
from joerg
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/tools/fs.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/fs.cpp
diff -u src/external/bsd/atf/dist/tools/fs.cpp:1.3 src/external/bsd/atf/dist/tools/fs.cpp:1.4
--- src/external/bsd/atf/dist/tools/fs.cpp:1.3 Tue Feb 11 18:13:45 2014
+++ src/external/bsd/atf/dist/tools/fs.cpp Sat Nov 11 14:16:06 2017
@@ -707,11 +707,17 @@ impl::cleanup(const path& p)
impl::path
impl::get_current_dir(void)
{
-std::auto_ptr< char > cwd;
-cwd.reset(getcwd(NULL, 0));
-if (cwd.get() == NULL)
+char *cwd = getcwd(NULL, 0);
+if (cwd == NULL)
throw tools::system_error(IMPL_NAME "::get_current_dir()",
"getcwd() failed", errno);
-return path(cwd.get());
+try {
+impl::path p(cwd);
+free(cwd);
+return p;
+} catch(...) {
+free(cwd);
+throw;
+}
}
CVS commit: src/external/bsd/atf/lib/libatf-c++
Module Name:src Committed By: christos Date: Fri Oct 6 19:19:36 UTC 2017 Modified Files: src/external/bsd/atf/lib/libatf-c++: shlib_version Log Message: bump because libstdc++ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/libatf-c++/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/lib/libatf-c++/shlib_version diff -u src/external/bsd/atf/lib/libatf-c++/shlib_version:1.2 src/external/bsd/atf/lib/libatf-c++/shlib_version:1.3 --- src/external/bsd/atf/lib/libatf-c++/shlib_version:1.2 Sat Feb 8 14:15:33 2014 +++ src/external/bsd/atf/lib/libatf-c++/shlib_version Fri Oct 6 15:19:36 2017 @@ -1,3 +1,3 @@ -# $NetBSD: shlib_version,v 1.2 2014/02/08 19:15:33 jmmv Exp $ -major=1 +# $NetBSD: shlib_version,v 1.3 2017/10/06 19:19:36 christos Exp $ +major=2 minor=0
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: kre
Date: Mon May 15 04:54:09 UTC 2017
Modified Files:
src/external/bsd/atf/dist/atf-sh: atf-sh-api.3
Log Message:
Add some information learned from experience with using (and abusing)
this API...
While here do some markup improvements (it is amazing what one can
learn from observing a wizard at work!) (which still probably need more work.)
In particular, sh functions are not functions in the mdoc .Fn sense!
(Many places where explicit double quotes were not doing what was intended.)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/atf/dist/atf-sh/atf-sh-api.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/atf-sh-api.3
diff -u src/external/bsd/atf/dist/atf-sh/atf-sh-api.3:1.1.1.7 src/external/bsd/atf/dist/atf-sh/atf-sh-api.3:1.2
--- src/external/bsd/atf/dist/atf-sh/atf-sh-api.3:1.1.1.7 Sat Feb 8 19:11:32 2014
+++ src/external/bsd/atf/dist/atf-sh/atf-sh-api.3 Mon May 15 04:54:09 2017
@@ -26,7 +26,7 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 13, 2013
+.Dd May 15, 2017
.Dt ATF-SH-API 3
.Os
.Sh NAME
@@ -51,25 +51,44 @@
.Nm atf_test_case
.Nd POSIX shell API to write ATF-based test programs
.Sh SYNOPSIS
-.Fn atf_add_test_case "name"
-.Fn atf_check "command"
-.Fn atf_check_equal "expr1" "expr2"
-.Fn atf_config_get "var_name"
-.Fn atf_config_has "var_name"
-.Fn atf_expect_death "reason" "..."
-.Fn atf_expect_exit "exitcode" "reason" "..."
-.Fn atf_expect_fail "reason" "..."
-.Fn atf_expect_pass
-.Fn atf_expect_signal "signo" "reason" "..."
-.Fn atf_expect_timeout "reason" "..."
-.Fn atf_fail "reason"
-.Fn atf_get "var_name"
-.Fn atf_get_srcdir
-.Fn atf_pass
-.Fn atf_require_prog "prog_name"
-.Fn atf_set "var_name" "value"
-.Fn atf_skip "reason"
-.Fn atf_test_case "name" "cleanup"
+.Ic atf_add_test_case Dq name
+.br
+.Ic atf_check Dq command
+.br
+.Ic atf_check_equal Do expr1 Dc Dq expr2
+.br
+.Ic atf_config_get Dq var_name
+.br
+.Ic atf_config_has Dq var_name
+.br
+.Ic atf_expect_death Do reason Dc Dq \&...
+.br
+.Ic atf_expect_exit Do exitcode Dc Do reason Dc Dq \&...
+.br
+.Ic atf_expect_fail Do reason Dc Dq \&...
+.br
+.Ic atf_expect_pass
+.br
+.Ic atf_expect_signal Do signo Dc Do reason Dc Dq \&...
+.br
+.Ic atf_expect_timeout Do reason Dc Dq \&...
+.br
+.Ic atf_fail Dq reason
+.br
+.Ic atf_get Dq var_name
+.br
+.Ic atf_get_srcdir
+.br
+.Ic atf_pass
+.br
+.Ic atf_require_prog Dq prog_name
+.br
+.Ic atf_set Do var_name Dc Dq value
+.br
+.Ic atf_skip Dq reason
+.br
+.Ic atf_test_case Do name Dc Dq cleanup
+.br
.Sh DESCRIPTION
ATF
provides a simple but powerful interface to easily write test programs in
@@ -114,13 +133,43 @@ atf_init_test_cases() {
... add additional test cases ...
}
.Ed
+.Pp
+All of these functions are required to return with an exit-status of
+zero, or ATF will determine that the test is faulty.
+In particular, this means that none may end with a conditional like:
+.Bd -literal -offset indent
+atf_sh_function() {
+... appropriate code here ...
+condition-test && {
+ ... more code here ...
+}
+}
+.Ed
+.Pp
+as if condition-test fails
+the return code from atf_sh_function will not be 0.
+This can be corrected by adding
+.Bd -literal -offset indent
+return 0
+.Ed
+.Pp
+before the end of the function, or by writing it as
+.Bd -literal -offset indent
+atf_sh_function() {
+... appropriate code here ...
+if condition-test
+then
+ ... more code here ...
+fi
+}
+.Ed
.Ss Definition of test cases
Test cases have an identifier and are composed of three different parts:
the header, the body and an optional cleanup routine, all of which are
described in
.Xr atf-test-case 4 .
To define test cases, one can use the
-.Fn atf_test_case
+.Ic atf_test_case
function, which takes a first parameter specifiying the test case's
name and instructs the library to set things up to accept it as a valid
test case.
@@ -132,33 +181,34 @@ It is important to note that this functi
.Em does not
set the test case up for execution when the program is run.
In order to do so, a later registration is needed through the
-.Fn atf_add_test_case
+.Ic atf_add_test_case
function detailed in
.Sx Program initialization .
.Pp
Later on, one must define the three parts of the body by providing two
or three functions (remember that the cleanup routine is optional).
These functions are named after the test case's identifier, and are
-.Fn _head ,
-.Fn _body
+.Ic _head ,
+.Ic _body
and
-.Fn _cleanup.
+.Ic _cleanup.
None of these take parameters when executed.
.Ss Program initialization
The test program must define an
-.Fn atf_init_test_cases
+.Ic atf_init_test_cases
function, which is in charge of registering the test cases that will be
executed at run time by using
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: christos
Date: Wed Dec 30 22:23:02 UTC 2015
Modified Files:
src/external/bsd/atf/dist/atf-sh: libatf-sh.subr
Log Message:
Work around ksh bug
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
diff -u src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.3 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.4
--- src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.3 Thu Jan 9 20:39:32 2014
+++ src/external/bsd/atf/dist/atf-sh/libatf-sh.subr Wed Dec 30 17:23:02 2015
@@ -526,7 +526,10 @@ _atf_list_tcs()
echo "ident: $(atf_get ident)"
for _var in ${Test_Case_Vars}; do
+ # Elide ksh bug!
+ set +e
[ "${_var}" != "ident" ] && echo "${_var}: $(atf_get ${_var})"
+ set -e
done
[ ${#} -gt 1 ] && echo
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src
Committed By: christos
Date: Wed Dec 30 22:23:38 UTC 2015
Modified Files:
src/external/bsd/atf/dist/tools: process.cpp process.hpp
test-program.cpp
Log Message:
Print symbolically why the process exited.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/tools/process.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/process.hpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/tools/test-program.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/process.cpp
diff -u src/external/bsd/atf/dist/tools/process.cpp:1.3 src/external/bsd/atf/dist/tools/process.cpp:1.4
--- src/external/bsd/atf/dist/tools/process.cpp:1.3 Tue Feb 11 13:13:45 2014
+++ src/external/bsd/atf/dist/tools/process.cpp Wed Dec 30 17:23:38 2015
@@ -360,6 +360,25 @@ impl::status::~status(void)
{
}
+std::string
+impl::status::str(void)
+ const
+{
+int mutable_status = m_status;
+std::stringstream rv;
+if (WIFEXITED(mutable_status))
+ rv << "exit(" << WEXITSTATUS(mutable_status);
+else if (WIFSTOPPED(mutable_status))
+ rv << "stopped(" << WSTOPSIG(mutable_status);
+else if (WIFSIGNALED(mutable_status))
+ rv << "terminated(" << WTERMSIG(mutable_status);
+if (WCOREDUMP(mutable_status))
+ rv << "/core)";
+else
+ rv << ")";
+return rv.str();
+}
+
bool
impl::status::exited(void)
const
Index: src/external/bsd/atf/dist/tools/process.hpp
diff -u src/external/bsd/atf/dist/tools/process.hpp:1.1.1.1 src/external/bsd/atf/dist/tools/process.hpp:1.2
--- src/external/bsd/atf/dist/tools/process.hpp:1.1.1.1 Sat Feb 8 14:11:33 2014
+++ src/external/bsd/atf/dist/tools/process.hpp Wed Dec 30 17:23:38 2015
@@ -207,6 +207,8 @@ class status {
public:
~status(void);
+std::string str(void) const;
+
bool exited(void) const;
int exitstatus(void) const;
Index: src/external/bsd/atf/dist/tools/test-program.cpp
diff -u src/external/bsd/atf/dist/tools/test-program.cpp:1.2 src/external/bsd/atf/dist/tools/test-program.cpp:1.3
--- src/external/bsd/atf/dist/tools/test-program.cpp:1.2 Tue Feb 11 11:31:38 2014
+++ src/external/bsd/atf/dist/tools/test-program.cpp Wed Dec 30 17:23:38 2015
@@ -664,7 +664,7 @@ impl::get_metadata(const tools::fs::path
const tools::process::status status = child.wait();
if (!status.exited() || status.exitstatus() != EXIT_SUCCESS)
throw tools::parser::format_error("Test program returned failure "
-"exit status for test case list");
+ "exit status " + status.str() + " for test case list");
return metadata(parser.get_tcs());
}
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: christos
Date: Fri Dec 4 01:43:58 UTC 2015
Modified Files:
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
Log Message:
fix the open error messages to include the right file and strerror
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.9 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.10
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.9 Sat Feb 8 14:13:44 2014
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Thu Dec 3 20:43:58 2015
@@ -359,11 +359,20 @@ execute_with_shell(char* const* argv)
static
void
+open_error(const atf::fs::path& path)
+{
+throw std::runtime_error("Failed to open " + path.str() + " "
+ + ::strerror(errno));
+}
+
+
+static
+void
cat_file(const atf::fs::path& path)
{
std::ifstream stream(path.c_str());
if (!stream)
-throw std::runtime_error("Failed to open " + path.str());
+ open_error(path);
stream >> std::noskipws;
std::istream_iterator< char > begin(stream), end;
@@ -379,7 +388,7 @@ grep_file(const atf::fs::path& path, con
{
std::ifstream stream(path.c_str());
if (!stream)
-throw std::runtime_error("Failed to open " + path.str());
+ open_error(path);
bool found = false;
@@ -410,11 +419,11 @@ compare_files(const atf::fs::path& p1, c
std::ifstream f1(p1.c_str());
if (!f1)
-throw std::runtime_error("Failed to open " + p1.str());
+ open_error(p1);
std::ifstream f2(p2.c_str());
if (!f2)
-throw std::runtime_error("Failed to open " + p1.str());
+ open_error(p2);
for (;;) {
char buf1[512], buf2[512];
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: martin
Date: Mon Feb 23 08:48:18 UTC 2015
Modified Files:
src/external/bsd/atf/dist/atf-sh: atf_check_test.sh
Log Message:
Wait 10 seconds instead of 1 before killing the helper - otherwise on slow
machines it might not have gotten around to execute the first command at
all (and since it next waits for 42 seconds, 10 seconds is safe).
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
src/external/bsd/atf/dist/atf-sh/atf_check_test.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/atf_check_test.sh
diff -u src/external/bsd/atf/dist/atf-sh/atf_check_test.sh:1.1.1.5 src/external/bsd/atf/dist/atf-sh/atf_check_test.sh:1.2
--- src/external/bsd/atf/dist/atf-sh/atf_check_test.sh:1.1.1.5 Sat Feb 8 19:11:32 2014
+++ src/external/bsd/atf/dist/atf-sh/atf_check_test.sh Mon Feb 23 08:48:18 2015
@@ -174,7 +174,7 @@ flush_stdout_on_timeout_body()
$(atf_get_srcdir)/misc_helpers -s $(atf_get_srcdir) atf_check_timeout \
out 2err
pid=${!}
-sleep 1
+sleep 10
kill ${pid}
grep 'Executing command.*true' out \
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: gson Date: Thu Jan 22 12:33:36 UTC 2015 Modified Files: src/external/bsd/atf/dist/atf-c: macros_test.c src/external/bsd/atf/dist/atf-c++: macros_test.cpp Log Message: Mark atf/atf-c/macros_test/detect_unused_tests and atf/atf-c++/macros_test/detect_unused_tests as expected failures when using versions of GCC where they are known to fail, with a reference to PR toolchain/49187. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/macros_test.c cvs rdiff -u -r1.1.1.8 -r1.2 \ src/external/bsd/atf/dist/atf-c++/macros_test.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/macros_test.c diff -u src/external/bsd/atf/dist/atf-c/macros_test.c:1.4 src/external/bsd/atf/dist/atf-c/macros_test.c:1.5 --- src/external/bsd/atf/dist/atf-c/macros_test.c:1.4 Sat Feb 8 19:13:43 2014 +++ src/external/bsd/atf/dist/atf-c/macros_test.c Thu Jan 22 12:33:35 2015 @@ -863,6 +863,10 @@ ATF_TC_BODY(detect_unused_tests, tc) atf_tc_expect_fail(Compiler does not raise a warning on an unused static global variable declared by a macro); +#if __GNUC__ 4 || (__GNUC__ == 4 __GNUC_MINOR__ = 8) +atf_tc_expect_fail(PR 49187); +#endif + if (build_check_c_o_srcdir(tc, unused_test.c)) atf_tc_fail(Build of unused_test.c passed; unused test cases are not properly detected); Index: src/external/bsd/atf/dist/atf-c++/macros_test.cpp diff -u src/external/bsd/atf/dist/atf-c++/macros_test.cpp:1.1.1.8 src/external/bsd/atf/dist/atf-c++/macros_test.cpp:1.2 --- src/external/bsd/atf/dist/atf-c++/macros_test.cpp:1.1.1.8 Sat Feb 8 19:11:31 2014 +++ src/external/bsd/atf/dist/atf-c++/macros_test.cpp Thu Jan 22 12:33:36 2015 @@ -783,6 +783,10 @@ ATF_TEST_CASE_BODY(detect_unused_tests) expect_fail(Compiler does not raise a warning on an unused static global variable declared by a macro); +#if __GNUC__ 4 || (__GNUC__ == 4 __GNUC_MINOR__ = 8) +expect_fail(PR 49187); +#endif + if (build_check_cxx_o_srcdir(*this, unused_test.cpp)) ATF_FAIL(Build of unused_test.cpp passed; unused test cases are not properly detected);
CVS commit: src/external/bsd/atf/tests/atf/atf-sh
Module Name:src
Committed By: jmmv
Date: Mon Mar 3 19:56:32 UTC 2014
Modified Files:
src/external/bsd/atf/tests/atf/atf-sh: Makefile
Added Files:
src/external/bsd/atf/tests/atf/atf-sh: Atffile Kyuafile
Log Message:
Avoid running a helper program for atf-sh as a test.
Should fix failures observed in PR bin/48624.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-sh/Atffile \
src/external/bsd/atf/tests/atf/atf-sh/Kyuafile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/tests/atf/atf-sh/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.7 src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.8
--- src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.7 Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Makefile Mon Mar 3 19:56:32 2014
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/03 19:56:32 jmmv Exp $
.include bsd.init.mk
TESTSDIR= ${TESTSBASE}/atf/atf-sh
+ATFFILE= yes
+KYUAFILE= yes
.PATH: ${SRCDIR}/atf-sh
Added files:
Index: src/external/bsd/atf/tests/atf/atf-sh/Atffile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-sh/Atffile:1.1
--- /dev/null Mon Mar 3 19:56:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Atffile Mon Mar 3 19:56:32 2014
@@ -0,0 +1,11 @@
+Content-Type: application/X-atf-atffile; version=1
+
+prop: test-suite = NetBSD
+
+tp: atf-check_test
+tp: atf_check_test
+tp: config_test
+tp: integration_test
+tp: normalize_test
+tp: tc_test
+tp: tp_test
Index: src/external/bsd/atf/tests/atf/atf-sh/Kyuafile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-sh/Kyuafile:1.1
--- /dev/null Mon Mar 3 19:56:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Kyuafile Mon Mar 3 19:56:32 2014
@@ -0,0 +1,11 @@
+syntax(2)
+
+test_suite(NetBSD)
+
+atf_test_program{name=atf-check_test}
+atf_test_program{name=atf_check_test}
+atf_test_program{name=config_test}
+atf_test_program{name=integration_test}
+atf_test_program{name=normalize_test}
+atf_test_program{name=tc_test}
+atf_test_program{name=tp_test}
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sun Mar 2 22:50:13 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: atf-version.cpp
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Log Message:
Fix bundling of the atf version into pkgconfig files and atf-version.
Sigh; one more attempt. This time I'm sure I've verified that the
.pc files contain the right number and that atf-version also outputs
the right stuff... Both with a clean and non-clean obj directory.
Should fix part of the problems reported in PR bin/48624.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/tools/atf-version.cpp
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/usr.bin/atf-version/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/atf-version.cpp
diff -u src/external/bsd/atf/dist/tools/atf-version.cpp:1.5 src/external/bsd/atf/dist/tools/atf-version.cpp:1.6
--- src/external/bsd/atf/dist/tools/atf-version.cpp:1.5 Tue Feb 11 18:07:30 2014
+++ src/external/bsd/atf/dist/tools/atf-version.cpp Sun Mar 2 22:50:13 2014
@@ -31,6 +31,7 @@
#include iostream
#include application.hpp
+#include version.hpp
class atf_version : public tools::application::app {
static const char* m_description;
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.20 src/external/bsd/atf/lib/libatf-c/Makefile:1.21
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.20 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Mar 2 22:50:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2014/03/02 22:50:13 jmmv Exp $
NOLINT= # defined
@@ -59,7 +59,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in atf-version.txt
- ${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
+ ${TOOL_SED} -e s,__ATF_VERSION__,$$(cat atf-version.txt),g \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.23 src/external/bsd/atf/lib/libatf-c++/Makefile:1.24
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.23 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Mar 2 22:50:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2014/03/02 22:50:13 jmmv Exp $
NOLINT= # defined
@@ -48,7 +48,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in atf-version.txt
- ${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
+ ${TOOL_SED} -e s,__ATF_VERSION__,$$(cat atf-version.txt),g \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.11 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.12
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.11 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Sun Mar 2 22:50:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/02 22:50:13 jmmv Exp $
.include bsd.init.mk
@@ -26,7 +26,7 @@ FILESDIR_atf-sh.pc= /usr/lib/pkgconfig
realall: atf-sh.pc
atf-sh.pc: Makefile atf-sh.pc.in atf-version.txt
- ${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
+ ${TOOL_SED} -e s,__ATF_VERSION__,$$(cat atf-version.txt),g \
-e 's,__EXEC_PREFIX__,/usr,g' \
${SRCDIR}/atf-sh/atf-sh.pc.in atf-sh.pc
CLEANFILES+= atf-sh.pc
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.12 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.13
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.12 Sat Feb 15 04:19:46 2014
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Sun Mar 2 22:50:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/02/15 04:19:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/02 22:50:13 jmmv Exp $
USE_ATF_LIBTOOLS= yes
@@ -12,10 +12,13 @@ SRCS= atf-version.cpp
MAN= atf-version.1
CPPFLAGS+= -I${SRCDIR}/tools
+CPPFLAGS+= -I.
WARNS?= 2
-CPPFLAGS+= -DATF_VERSION=\$(ATF_VERSION)\
-atf-version.o: atf-version.txt
+DPSRCS+= version.hpp
+CLEANFILES+=
CVS commit: src/external/bsd/atf/tests/atf/tools
Module Name:src
Committed By: jmmv
Date: Sat Feb 15 19:33:54 UTC 2014
Modified Files:
src/external/bsd/atf/tests/atf/tools: Makefile
Added Files:
src/external/bsd/atf/tests/atf/tools: Atffile Kyuafile
Log Message:
Prevent registering the helper programs as test programs.
Same trick as with atf/test-programs: provide hand-generated Atffile and
Kyuafile files so that the helpers that we build as test programs do not
end up in them.
Reported by gson@.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/tools/Atffile \
src/external/bsd/atf/tests/atf/tools/Kyuafile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/tests/atf/tools/Makefile
diff -u src/external/bsd/atf/tests/atf/tools/Makefile:1.5 src/external/bsd/atf/tests/atf/tools/Makefile:1.6
--- src/external/bsd/atf/tests/atf/tools/Makefile:1.5 Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/tests/atf/tools/Makefile Sat Feb 15 19:33:54 2014
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/15 19:33:54 jmmv Exp $
USE_ATF_LIBTOOLS= yes
.include bsd.init.mk
TESTSDIR= ${TESTSBASE}/atf/tools
+ATFFILE= no
+KYUAFILE= no
.PATH: ${SRCDIR}/tools
Added files:
Index: src/external/bsd/atf/tests/atf/tools/Atffile
diff -u /dev/null src/external/bsd/atf/tests/atf/tools/Atffile:1.1
--- /dev/null Sat Feb 15 19:33:54 2014
+++ src/external/bsd/atf/tests/atf/tools/Atffile Sat Feb 15 19:33:54 2014
@@ -0,0 +1,25 @@
+Content-Type: application/X-atf-atffile; version=1
+
+prop: test-suite = NetBSD
+
+tp: application_test
+tp: atffile_test
+tp: auto_array_test
+tp: config_file_test
+tp: config_test
+tp: env_test
+tp: expand_test
+tp: fs_test
+tp: io_test
+tp: parser_test
+tp: process_test
+tp: reader_test
+tp: requirements_test
+tp: signals_test
+tp: test_program_test
+tp: text_test
+tp: ui_test
+tp: user_test
+tp: atf-config_test
+tp: atf-report_test
+tp: atf-run_test
Index: src/external/bsd/atf/tests/atf/tools/Kyuafile
diff -u /dev/null src/external/bsd/atf/tests/atf/tools/Kyuafile:1.1
--- /dev/null Sat Feb 15 19:33:54 2014
+++ src/external/bsd/atf/tests/atf/tools/Kyuafile Sat Feb 15 19:33:54 2014
@@ -0,0 +1,25 @@
+syntax(2)
+
+test_suite(NetBSD)
+
+atf_test_program{name=application_test}
+atf_test_program{name=atffile_test}
+atf_test_program{name=auto_array_test}
+atf_test_program{name=config_file_test}
+atf_test_program{name=config_test}
+atf_test_program{name=env_test}
+atf_test_program{name=expand_test}
+atf_test_program{name=fs_test}
+atf_test_program{name=io_test}
+atf_test_program{name=parser_test}
+atf_test_program{name=process_test}
+atf_test_program{name=reader_test}
+atf_test_program{name=requirements_test}
+atf_test_program{name=signals_test}
+atf_test_program{name=test_program_test}
+atf_test_program{name=text_test}
+atf_test_program{name=ui_test}
+atf_test_program{name=user_test}
+atf_test_program{name=atf-config_test}
+atf_test_program{name=atf-report_test}
+atf_test_program{name=atf-run_test}
CVS commit: src/external/bsd/atf/tests/atf/tools
Module Name:src
Committed By: jmmv
Date: Sat Feb 15 22:32:26 UTC 2014
Modified Files:
src/external/bsd/atf/tests/atf/tools: Makefile
Log Message:
Obviously, we want ATFFILE and KYUAFILE to be set to yes...
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/tests/atf/tools/Makefile
diff -u src/external/bsd/atf/tests/atf/tools/Makefile:1.6 src/external/bsd/atf/tests/atf/tools/Makefile:1.7
--- src/external/bsd/atf/tests/atf/tools/Makefile:1.6 Sat Feb 15 19:33:54 2014
+++ src/external/bsd/atf/tests/atf/tools/Makefile Sat Feb 15 22:32:26 2014
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2014/02/15 19:33:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2014/02/15 22:32:26 jmmv Exp $
USE_ATF_LIBTOOLS= yes
.include bsd.init.mk
TESTSDIR= ${TESTSBASE}/atf/tools
-ATFFILE= no
-KYUAFILE= no
+ATFFILE= yes
+KYUAFILE= yes
.PATH: ${SRCDIR}/tools
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sat Feb 15 02:02:39 UTC 2014
Modified Files:
src/external/bsd/atf: Makefile.inc
Log Message:
Fix path to libtools.a.
The build would break when we do not use MAKEOBJDIR* but do use OBJMACHINE.
Problem found by B Harder and fix based on patch from NONAKA Kimihiro as
posted on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.3 src/external/bsd/atf/Makefile.inc:1.4
--- src/external/bsd/atf/Makefile.inc:1.3 Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/Makefile.inc Sat Feb 15 02:02:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.4 2014/02/15 02:02:39 jmmv Exp $
.include bsd.own.mk
@@ -39,8 +39,8 @@ CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # Fo
CPPFLAGS+= -I${SRCDIR}
.if defined(USE_ATF_LIBTOOLS)
-PRIVATELIBDIR!= cd ${TOPDIR}/lib; ${PRINTOBJDIR}
-CPPFLAGS+= -I${PRIVATELIBDIR}/tools
-LDADD+= ${PRIVATELIBDIR}/tools/libtools.a
-DPADD+= ${PRIVATELIBDIR}/tools/libtools.a
+LIBTOOLSOBJDIR!= cd ${TOPDIR}/lib/tools; ${PRINTOBJDIR}
+CPPFLAGS+= -I${LIBTOOLSOBJDIR}
+LDADD+= ${LIBTOOLSOBJDIR}/libtools.a
+DPADD+= ${LIBTOOLSOBJDIR}/libtools.a
.endif
CVS commit: src/external/bsd/atf/tests/atf/test-programs
Module Name:src
Committed By: jmmv
Date: Sat Feb 15 04:15:20 UTC 2014
Modified Files:
src/external/bsd/atf/tests/atf/test-programs: Makefile
Added Files:
src/external/bsd/atf/tests/atf/test-programs: Atffile Kyuafile
Log Message:
Prevent registering the helper programs as test programs.
They are not intended to be run neither by atf-run nor Kyua, and doing so
results in test failures. The easiest way to do this for now is to just
ship custom Atffile and Kyuafile files. (This broke because with atf-0.20
we started using the auto-generated versions of these, and due to the way
bsd.test.mk works, these registered the helpers as well.)
Problem reported by martin@.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/test-programs/Atffile \
src/external/bsd/atf/tests/atf/test-programs/Kyuafile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/atf/tests/atf/test-programs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/tests/atf/test-programs/Makefile
diff -u src/external/bsd/atf/tests/atf/test-programs/Makefile:1.5 src/external/bsd/atf/tests/atf/test-programs/Makefile:1.6
--- src/external/bsd/atf/tests/atf/test-programs/Makefile:1.5 Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Makefile Sat Feb 15 04:15:20 2014
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/15 04:15:20 jmmv Exp $
.include bsd.init.mk
TESTSDIR= ${TESTSBASE}/atf/test-programs
+ATFFILE= yes
+KYUAFILE= yes
.PATH: ${SRCDIR}/test-programs
Added files:
Index: src/external/bsd/atf/tests/atf/test-programs/Atffile
diff -u /dev/null src/external/bsd/atf/tests/atf/test-programs/Atffile:1.1
--- /dev/null Sat Feb 15 04:15:20 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Atffile Sat Feb 15 04:15:20 2014
@@ -0,0 +1,9 @@
+Content-Type: application/X-atf-atffile; version=1
+
+prop: test-suite = NetBSD
+
+tp: config_test
+tp: expect_test
+tp: meta_data_test
+tp: result_test
+tp: srcdir_test
Index: src/external/bsd/atf/tests/atf/test-programs/Kyuafile
diff -u /dev/null src/external/bsd/atf/tests/atf/test-programs/Kyuafile:1.1
--- /dev/null Sat Feb 15 04:15:20 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Kyuafile Sat Feb 15 04:15:20 2014
@@ -0,0 +1,9 @@
+syntax(2)
+
+test_suite(NetBSD)
+
+atf_test_program{name=config_test}
+atf_test_program{name=expect_test}
+atf_test_program{name=meta_data_test}
+atf_test_program{name=result_test}
+atf_test_program{name=srcdir_test}
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sat Feb 15 04:19:46 UTC 2014
Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Log Message:
Fix the bundling of the version number in built files.
Yes, attempting yet another fix at this so that the version number that
gets recorded in the pkgconfig files and inside atf-version really matches
the latest imported version. Should resolve issues where the built files
get stuck with an older version number during update builds.
This time, I'm trying the same approach I applied in the FreeBSD source
tree, which has been working fine so far across various release imports.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/usr.bin/atf-version/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.4 src/external/bsd/atf/Makefile.inc:1.5
--- src/external/bsd/atf/Makefile.inc:1.4 Sat Feb 15 02:02:39 2014
+++ src/external/bsd/atf/Makefile.inc Sat Feb 15 04:19:46 2014
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile.inc,v 1.4 2014/02/15 02:02:39 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/02/15 04:19:46 jmmv Exp $
.include bsd.own.mk
TOPDIR= ${NETBSDSRCDIR}/external/bsd/atf
SRCDIR= ${TOPDIR}/dist
-ATF_VERSION!= grep 'define VERSION' ${TOPDIR}/bconfig.h | cut -d '' -f 2
-cookie-version: cookie-version-2
- @cmp -s cookie-version cookie-version-2 \
- || cp cookie-version-2 cookie-version
-cookie-version-2: .PHONY
- @echo ${ATF_VERSION} cookie-version-2
-CLEANFILES+= cookie-version cookie-version-2
+# Depend on the atf-version.txt target to generate a file that contains
+# the version number of the currently imported ATF release and that only
+# changes on new imports.
+atf-version.txt: atf-version-real.txt
+ @cmp -s atf-version.txt atf-version-real.txt \
+ || cp atf-version-real.txt atf-version.txt
+atf-version-real.txt: .PHONY
+ @grep 'define VERSION' ${TOPDIR}/bconfig.h \
+ | cut -d '' -f 2 atf-version-real.txt
+CLEANFILES+= atf-version.txt atf-version-real.txt
CPPFLAGS+= -DHAVE_CONFIG_H
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.19 src/external/bsd/atf/lib/libatf-c/Makefile:1.20
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.19 Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sat Feb 15 04:19:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2014/02/15 04:19:46 jmmv Exp $
NOLINT= # defined
@@ -58,8 +58,8 @@ FILES+= atf-c.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
-atf-c.pc: Makefile atf-c.pc.in cookie-version
- ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
+atf-c.pc: Makefile atf-c.pc.in atf-version.txt
+ ${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.22 src/external/bsd/atf/lib/libatf-c++/Makefile:1.23
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.22 Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sat Feb 15 04:19:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2014/02/15 04:19:46 jmmv Exp $
NOLINT= # defined
@@ -47,8 +47,8 @@ FILES+= atf-c++.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
-atf-c++.pc: Makefile atf-c++.pc.in cookie-version
- ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
+atf-c++.pc: Makefile atf-c++.pc.in atf-version.txt
+ ${TOOL_SED} -e 's,__ATF_VERSION__,$$(cat atf-version.txt),g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.10 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.11
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.10 Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Sat Feb 15 04:19:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2014/02/15 04:19:46 jmmv Exp $
.include bsd.init.mk
@@ -25,8 +25,8 @@ FILES+= atf-sh.pc
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Tue Feb 11 16:10:41 UTC 2014 Removed Files: src/external/bsd/atf/dist: Atffile src/external/bsd/atf/dist/atf-c: Atffile src/external/bsd/atf/dist/atf-c++: Atffile src/external/bsd/atf/dist/atf-c++/detail: Atffile src/external/bsd/atf/dist/atf-c/detail: Atffile src/external/bsd/atf/dist/atf-sh: Atffile src/external/bsd/atf/dist/test-programs: Atffile src/external/bsd/atf/dist/tools: Atffile Log Message: Merge atf-0.20. The upstream Atffiles are gone so we will just rely on our automatic generation of such files from bsd.test.mk. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/atf/dist/Atffile cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/dist/atf-c/Atffile cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c++/Atffile cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/atf-c++/detail/Atffile cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/detail/Atffile cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-sh/Atffile cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/test-programs/Atffile cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/tools/Atffile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 16:11:29 UTC 2014
Modified Files:
src/external/bsd/atf: prepare-import.sh
src/external/bsd/atf/lib/libatf-c: bconfig.h
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-c++/detail: Makefile
src/external/bsd/atf/tests/atf/atf-c/detail: Makefile
src/external/bsd/atf/tests/atf/atf-config: Makefile
src/external/bsd/atf/tests/atf/atf-report: Makefile
src/external/bsd/atf/tests/atf/atf-run: Makefile
src/external/bsd/atf/tests/atf/atf-sh: Makefile
src/external/bsd/atf/tests/atf/test-programs: Makefile
src/external/bsd/atf/tests/atf/tools: Makefile
Log Message:
Update reachover build files for atf-0.20.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/prepare-import.sh
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/atf-config/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-report/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-run/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-sh/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/atf/tests/atf/test-programs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/prepare-import.sh
diff -u src/external/bsd/atf/prepare-import.sh:1.7 src/external/bsd/atf/prepare-import.sh:1.8
--- src/external/bsd/atf/prepare-import.sh:1.7 Sat Feb 8 19:06:05 2014
+++ src/external/bsd/atf/prepare-import.sh Tue Feb 11 16:11:28 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.7 2014/02/08 19:06:05 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.8 2014/02/11 16:11:28 jmmv Exp $
#
# Use this script to recreate the 'dist' subdirectory from a newly released
# distfile. The script takes care of unpacking the distfile, removing any
@@ -14,6 +14,7 @@ ProgName=${0##*/}
CLEAN_PATTERNS=
CLEAN_PATTERNS=${CLEAN_PATTERNS} *.m4
CLEAN_PATTERNS=${CLEAN_PATTERNS} INSTALL TODO
+CLEAN_PATTERNS=${CLEAN_PATTERNS} Atffile */Atffile */*/Atffile
CLEAN_PATTERNS=${CLEAN_PATTERNS} Makefile* */Makefile* */*/Makefile*
CLEAN_PATTERNS=${CLEAN_PATTERNS} admin
CLEAN_PATTERNS=${CLEAN_PATTERNS} atf-*/atf-*.m4
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.13 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.14
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.13 Sun Feb 9 14:02:39 2014
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Tue Feb 11 16:11:28 2014
@@ -58,9 +58,6 @@
/* Define to 1 if vsnprintf is in std */
/* #undef HAVE_VSNPRINTF_IN_STD */
-/* Define to the last valid signal number */
-#define LAST_SIGNO 63
-
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#define LT_OBJDIR .libs/
@@ -78,7 +75,7 @@
#define PACKAGE_NAME Automated Testing Framework
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING Automated Testing Framework 0.19
+#define PACKAGE_STRING Automated Testing Framework 0.20
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME atf
@@ -87,10 +84,10 @@
#define PACKAGE_URL https://github.com/jmmv/atf/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 0.19
+#define PACKAGE_VERSION 0.20
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 0.19
+#define VERSION 0.20
Index: src/external/bsd/atf/lib/tools/Makefile
diff -u src/external/bsd/atf/lib/tools/Makefile:1.1 src/external/bsd/atf/lib/tools/Makefile:1.2
--- src/external/bsd/atf/lib/tools/Makefile:1.1 Sat Feb 8 19:15:33 2014
+++ src/external/bsd/atf/lib/tools/Makefile Tue Feb 11 16:11:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/02/08 19:15:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2014/02/11 16:11:28 jmmv Exp $
NOLINT= # defined
@@ -29,6 +29,7 @@ CPPFLAGS+= -DATF_MACHINE=\${MACHINE}\
CPPFLAGS+= -DATF_PKGDATADIR=\/usr/share/atf\
CPPFLAGS+= -DATF_SHELL=\/bin/sh\
CPPFLAGS+= -DATF_WORKDIR=\/tmp\
+CPPFLAGS+= -DLAST_SIGNO=63
CPPFLAGS+= -I${SRCDIR}/tools
CPPFLAGS+= -I.
CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For bconfig.h
Index:
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 16:31:38 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: application.cpp atf-config.cpp
atf-report.cpp atffile.cpp auto_array_test.cpp config_file.cpp
process.cpp reader.cpp reader_test.cpp requirements.cpp
signals_test.cpp test-program.cpp timers.cpp
src/external/bsd/atf/lib/tools: Makefile
Removed Files:
src/external/bsd/atf/dist/tools: defs.hpp.in
Log Message:
Remove defs.hpp.
Because we now own the 'tools' subdirectory in the tree, we can yank some
of the upstream autoconf-related complexity. Start doing so by removing
defs.hpp and using the real compiler attributes where necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/application.cpp \
src/external/bsd/atf/dist/tools/atffile.cpp \
src/external/bsd/atf/dist/tools/auto_array_test.cpp \
src/external/bsd/atf/dist/tools/config_file.cpp \
src/external/bsd/atf/dist/tools/process.cpp \
src/external/bsd/atf/dist/tools/reader.cpp \
src/external/bsd/atf/dist/tools/reader_test.cpp \
src/external/bsd/atf/dist/tools/requirements.cpp \
src/external/bsd/atf/dist/tools/signals_test.cpp \
src/external/bsd/atf/dist/tools/test-program.cpp \
src/external/bsd/atf/dist/tools/timers.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/tools/atf-config.cpp \
src/external/bsd/atf/dist/tools/atf-report.cpp
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/tools/defs.hpp.in
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/application.cpp
diff -u src/external/bsd/atf/dist/tools/application.cpp:1.1.1.1 src/external/bsd/atf/dist/tools/application.cpp:1.2
--- src/external/bsd/atf/dist/tools/application.cpp:1.1.1.1 Sat Feb 8 19:11:32 2014
+++ src/external/bsd/atf/dist/tools/application.cpp Tue Feb 11 16:31:38 2014
@@ -43,7 +43,6 @@ extern C {
#include iostream
#include application.hpp
-#include defs.hpp
#include ui.hpp
#if !defined(HAVE_VSNPRINTF_IN_STD)
@@ -148,8 +147,8 @@ impl::app::specific_options(void)
}
void
-impl::app::process_option(int ch ATF_DEFS_ATTRIBUTE_UNUSED,
- const char* arg ATF_DEFS_ATTRIBUTE_UNUSED)
+impl::app::process_option(int ch __attribute__((__unused__)),
+ const char* arg __attribute__((__unused__)))
{
}
Index: src/external/bsd/atf/dist/tools/atffile.cpp
diff -u src/external/bsd/atf/dist/tools/atffile.cpp:1.1.1.1 src/external/bsd/atf/dist/tools/atffile.cpp:1.2
--- src/external/bsd/atf/dist/tools/atffile.cpp:1.1.1.1 Sat Feb 8 19:11:32 2014
+++ src/external/bsd/atf/dist/tools/atffile.cpp Tue Feb 11 16:31:38 2014
@@ -32,7 +32,6 @@
#include fstream
#include atffile.hpp
-#include defs.hpp
#include exceptions.hpp
#include expand.hpp
#include parser.hpp
@@ -98,22 +97,22 @@ detail::atf_atffile_reader::~atf_atffile
void
detail::atf_atffile_reader::got_conf(
-const std::string name ATF_DEFS_ATTRIBUTE_UNUSED,
-const std::string val ATF_DEFS_ATTRIBUTE_UNUSED)
+const std::string name __attribute__((__unused__)),
+const std::string val __attribute__((__unused__)))
{
}
void
detail::atf_atffile_reader::got_prop(
-const std::string name ATF_DEFS_ATTRIBUTE_UNUSED,
-const std::string val ATF_DEFS_ATTRIBUTE_UNUSED)
+const std::string name __attribute__((__unused__)),
+const std::string val __attribute__((__unused__)))
{
}
void
detail::atf_atffile_reader::got_tp(
-const std::string name ATF_DEFS_ATTRIBUTE_UNUSED,
-bool isglob ATF_DEFS_ATTRIBUTE_UNUSED)
+const std::string name __attribute__((__unused__)),
+bool isglob __attribute__((__unused__)))
{
}
Index: src/external/bsd/atf/dist/tools/auto_array_test.cpp
diff -u src/external/bsd/atf/dist/tools/auto_array_test.cpp:1.1.1.1 src/external/bsd/atf/dist/tools/auto_array_test.cpp:1.2
--- src/external/bsd/atf/dist/tools/auto_array_test.cpp:1.1.1.1 Sat Feb 8 19:11:33 2014
+++ src/external/bsd/atf/dist/tools/auto_array_test.cpp Tue Feb 11 16:31:38 2014
@@ -36,7 +36,6 @@ extern C {
#include atf-c++.hpp
#include auto_array.hpp
-#include defs.hpp
//
// Tests for the auto_array class.
@@ -55,7 +54,7 @@ public:
return tools::auto_array test_array (ta);
}
-void* operator new(size_t size ATF_DEFS_ATTRIBUTE_UNUSED)
+void* operator new(size_t size __attribute__((__unused__)))
{
ATF_FAIL(New called but should have been new[]);
return new int(5);
@@ -69,7 +68,7 @@ public:
return mem;
}
-void operator delete(void* mem ATF_DEFS_ATTRIBUTE_UNUSED)
+void operator delete(void* mem __attribute__((__unused__)))
{
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 17:28:21 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: application.cpp atf-run.cpp
atf-version.cpp env.cpp fs.cpp signals.cpp timers.cpp
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/atf/usr.bin/atf-config: Makefile
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Log Message:
Stop using bconfig.h in the tools code.
Just assume the code is being built for NetBSD for simplicity reasons.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/tools/application.cpp \
src/external/bsd/atf/dist/tools/timers.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/tools/atf-run.cpp \
src/external/bsd/atf/dist/tools/atf-version.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/env.cpp \
src/external/bsd/atf/dist/tools/fs.cpp \
src/external/bsd/atf/dist/tools/signals.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/usr.bin/atf-version/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/application.cpp
diff -u src/external/bsd/atf/dist/tools/application.cpp:1.2 src/external/bsd/atf/dist/tools/application.cpp:1.3
--- src/external/bsd/atf/dist/tools/application.cpp:1.2 Tue Feb 11 16:31:38 2014
+++ src/external/bsd/atf/dist/tools/application.cpp Tue Feb 11 17:28:20 2014
@@ -27,10 +27,6 @@
// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
-#if defined(HAVE_CONFIG_H)
-#include bconfig.h
-#endif
-
extern C {
#include unistd.h
}
@@ -45,11 +41,9 @@ extern C {
#include application.hpp
#include ui.hpp
-#if !defined(HAVE_VSNPRINTF_IN_STD)
namespace std {
using ::vsnprintf;
}
-#endif // !defined(HAVE_VSNPRINTF_IN_STD)
namespace impl = tools::application;
#define IMPL_NAME tools::application
@@ -157,11 +151,7 @@ impl::app::process_options(void)
{
assert(inited());
-std::string optstr;
-#if defined(HAVE_GNU_GETOPT)
-optstr += '+'; // Turn on POSIX behavior.
-#endif
-optstr += ':';
+std::string optstr = :;
{
options_set opts = options();
for (options_set::const_iterator iter = opts.begin();
@@ -200,9 +190,7 @@ impl::app::process_options(void)
// Clear getopt state just in case the test wants to use it.
opterr = old_opterr;
optind = 1;
-#if defined(HAVE_OPTRESET)
optreset = 1;
-#endif
}
void
@@ -275,9 +263,8 @@ impl::app::run(int argc, char* const* ar
const std::string bug =
std::string(This is probably a bug in ) + m_prog_name +
- or one of the libraries it uses. Please report this problem to
-PACKAGE_BUGREPORT and provide as many details as possible
-describing how you got to this condition.;
+ Please use send-pr(1) to report this issue and provide as many
+ details as possible describing how you got to this condition.;
int errcode;
try {
Index: src/external/bsd/atf/dist/tools/timers.cpp
diff -u src/external/bsd/atf/dist/tools/timers.cpp:1.2 src/external/bsd/atf/dist/tools/timers.cpp:1.3
--- src/external/bsd/atf/dist/tools/timers.cpp:1.2 Tue Feb 11 16:31:38 2014
+++ src/external/bsd/atf/dist/tools/timers.cpp Tue Feb 11 17:28:20 2014
@@ -27,10 +27,6 @@
// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
-#if defined(HAVE_CONFIG_H)
-# include bconfig.h
-#endif
-
extern C {
#include sys/time.h
}
@@ -47,15 +43,10 @@ extern C {
namespace impl = tools::timers;
#define IMPL_NAME tools::timers
-#if !defined(HAVE_TIMER_T)
-static impl::timer* compat_handle;
-#endif
-
//
// Auxiliary functions.
//
-#if defined(HAVE_TIMER_T)
static
void
handler(const int signo __attribute__((__unused__)), siginfo_t* si,
@@ -65,29 +56,14 @@ handler(const int signo __attribute__((_
timer-set_fired();
timer-timeout_callback();
}
-#else
-static
-void
-handler(const int signo __attribute__((__unused__)),
-siginfo_t* si __attribute__((__unused__)),
-void* uc __attribute__((__unused__)))
-{
-compat_handle-set_fired();
-compat_handle-timeout_callback();
-}
-#endif
//
// The timer class.
//
struct impl::timer::impl {
-#if defined(HAVE_TIMER_T)
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 18:07:30 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: atf-version.cpp
src/external/bsd/atf/usr.bin/atf-version: Makefile
Removed Files:
src/external/bsd/atf/usr.bin/atf-version: revision.h
Log Message:
Remove revision.h and associated complexity from atf-version.
Arguably, this was never needed and only made the code and the build system
more complex for no real reason.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-version.cpp
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/usr.bin/atf-version/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/usr.bin/atf-version/revision.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/atf-version.cpp
diff -u src/external/bsd/atf/dist/tools/atf-version.cpp:1.4 src/external/bsd/atf/dist/tools/atf-version.cpp:1.5
--- src/external/bsd/atf/dist/tools/atf-version.cpp:1.4 Tue Feb 11 17:28:20 2014
+++ src/external/bsd/atf/dist/tools/atf-version.cpp Tue Feb 11 18:07:30 2014
@@ -31,8 +31,6 @@
#include iostream
#include application.hpp
-#include revision.h
-#include ui.hpp
class atf_version : public tools::application::app {
static const char* m_description;
@@ -55,28 +53,9 @@ atf_version::atf_version(void) :
int
atf_version::main(void)
{
-using tools::ui::format_text;
-using tools::ui::format_text_with_tag;
-
std::cout
Automated Testing Framework ATF_VERSION (atf- ATF_VERSION )\n
-Copyright (c) 2007 The NetBSD Foundation, Inc.\n\n;
-
-#if defined(PACKAGE_REVISION_TYPE_DIST)
-std::cout format_text(Built from a distribution file; no revision
-information available.) \n;
-#elif defined(PACKAGE_REVISION_TYPE_GIT)
-std::cout format_text_with_tag(PACKAGE_REVISION_BRANCH, Branch: ,
- false) \n;
-std::cout format_text_with_tag(PACKAGE_REVISION_BASE
-# if PACKAGE_REVISION_MODIFIED
- (locally modified)
-# endif
- PACKAGE_REVISION_DATE,
-Base revision: , false) \n;
-#else
-# error Unknown PACKAGE_REVISION_TYPE value
-#endif
+Copyright (c) 2007 The NetBSD Foundation, Inc.\n;
return EXIT_SUCCESS;
}
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.9 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.10
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.9 Tue Feb 11 17:28:21 2014
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Tue Feb 11 18:07:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/02/11 17:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/11 18:07:30 jmmv Exp $
.include bsd.own.mk
@@ -12,7 +12,6 @@ MAN= atf-version.1
CPPFLAGS+= -DATF_VERSION=\$(ATF_VERSION)\
CPPFLAGS+= -I${SRCDIR}/tools
-CPPFLAGS+= -I${.CURDIR}
USE_ATF_LIBTOOLS= yes
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 18:13:45 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: atf-run.cpp fs.cpp process.cpp
requirements.cpp requirements_test.cpp
Log Message:
Remove portability-related guards from the atf tools.
Just assume we are building for NetBSD given that the tools code is now
owned by the NetBSD tree.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-run.cpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/tools/fs.cpp \
src/external/bsd/atf/dist/tools/process.cpp \
src/external/bsd/atf/dist/tools/requirements.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/atf/dist/tools/requirements_test.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/tools/atf-run.cpp
diff -u src/external/bsd/atf/dist/tools/atf-run.cpp:1.4 src/external/bsd/atf/dist/tools/atf-run.cpp:1.5
--- src/external/bsd/atf/dist/tools/atf-run.cpp:1.4 Tue Feb 11 17:28:20 2014
+++ src/external/bsd/atf/dist/tools/atf-run.cpp Tue Feb 11 18:13:45 2014
@@ -64,12 +64,6 @@ typedef std::map std::string, std::stri
} // anonymous namespace
-#if defined(MAXCOMLEN)
-static const std::string::size_type max_core_name_length = MAXCOMLEN;
-#else
-static const std::string::size_type max_core_name_length = std::string::npos;
-#endif
-
class atf_run : public tools::application::app {
static const char* m_description;
@@ -127,7 +121,7 @@ dump_stacktrace(const tools::fs::path t
w.stderr_tc(Test program crashed; attempting to get stack trace);
const tools::fs::path corename = workdir /
-(tp.leaf_name().substr(0, max_core_name_length) + .core);
+(tp.leaf_name().substr(0, MAXCOMLEN) + .core);
if (!tools::fs::exists(corename)) {
w.stderr_tc(Expected file + corename.str() + not found);
return;
Index: src/external/bsd/atf/dist/tools/fs.cpp
diff -u src/external/bsd/atf/dist/tools/fs.cpp:1.2 src/external/bsd/atf/dist/tools/fs.cpp:1.3
--- src/external/bsd/atf/dist/tools/fs.cpp:1.2 Tue Feb 11 17:28:20 2014
+++ src/external/bsd/atf/dist/tools/fs.cpp Tue Feb 11 18:13:45 2014
@@ -434,9 +434,7 @@ impl::file_info::file_info(const path p
case S_IFLNK: m_type = lnk_type; break;
case S_IFREG: m_type = reg_type; break;
case S_IFSOCK: m_type = sock_type; break;
-#if defined(S_IFWHT)
case S_IFWHT: m_type = wht_type; break;
-#endif
default:
throw system_error(IMPL_NAME ::file_info, Unknown file type
error, EINVAL);
Index: src/external/bsd/atf/dist/tools/process.cpp
diff -u src/external/bsd/atf/dist/tools/process.cpp:1.2 src/external/bsd/atf/dist/tools/process.cpp:1.3
--- src/external/bsd/atf/dist/tools/process.cpp:1.2 Tue Feb 11 16:31:38 2014
+++ src/external/bsd/atf/dist/tools/process.cpp Tue Feb 11 18:13:45 2014
@@ -399,12 +399,8 @@ impl::status::coredump(void)
const
{
assert(signaled());
-#if defined(WCOREDUMP)
int mutable_status = m_status;
return WCOREDUMP(mutable_status);
-#else
-return false;
-#endif
}
//
Index: src/external/bsd/atf/dist/tools/requirements.cpp
diff -u src/external/bsd/atf/dist/tools/requirements.cpp:1.2 src/external/bsd/atf/dist/tools/requirements.cpp:1.3
--- src/external/bsd/atf/dist/tools/requirements.cpp:1.2 Tue Feb 11 16:31:38 2014
+++ src/external/bsd/atf/dist/tools/requirements.cpp Tue Feb 11 18:13:45 2014
@@ -145,14 +145,15 @@ check_machine(const std::string machine
return Requires one of the ' + machines + ' machine types;
}
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
static
std::string
-check_memory_sysctl(const int64_t needed, const char* sysctl_variable)
+check_memory(const std::string raw_memory)
{
+const int64_t needed = tools::text::to_bytes(raw_memory);
+
int64_t available;
std::size_t available_length = sizeof(available);
-if (::sysctlbyname(sysctl_variable, available, available_length,
+if (::sysctlbyname(hw.usermem64, available, available_length,
NULL, 0) == -1) {
const char* e = std::strerror(errno);
return Failed to get sysctl(hw.usermem64) value: + std::string(e);
@@ -164,55 +165,6 @@ check_memory_sysctl(const int64_t needed
} else
return ;
}
-# if defined(__APPLE__)
-static
-std::string
-check_memory_darwin(const int64_t needed)
-{
-return check_memory_sysctl(needed, hw.usermem);
-}
-# elif defined(__FreeBSD__)
-static
-std::string
-check_memory_freebsd(const int64_t needed)
-{
-return check_memory_sysctl(needed, hw.usermem);
-}
-# elif defined(__NetBSD__)
-static
-std::string
-check_memory_netbsd(const int64_t needed)
-{
-return check_memory_sysctl(needed, hw.usermem64);
-}
-# else
-# error
CVS commit: src/external/bsd/atf/tests/atf
Module Name:src Committed By: jmmv Date: Wed Feb 12 03:47:21 UTC 2014 Removed Files: src/external/bsd/atf/tests/atf/atf-config: Makefile src/external/bsd/atf/tests/atf/atf-report: Makefile src/external/bsd/atf/tests/atf/atf-run: Makefile Log Message: Remove unused reachover Makefiles. The content of these was subsumed into the sibling 'tools' subdirectory during the import of atf-0.19. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/external/bsd/atf/tests/atf/atf-config/Makefile cvs rdiff -u -r1.6 -r0 src/external/bsd/atf/tests/atf/atf-report/Makefile cvs rdiff -u -r1.7 -r0 src/external/bsd/atf/tests/atf/atf-run/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf
Module Name:src Committed By: jmmv Date: Wed Feb 12 04:08:32 UTC 2014 Modified Files: src/external/bsd/atf: Makefile.inc src/external/bsd/atf/etc/atf: Makefile src/external/bsd/atf/lib/libatf-c: Makefile src/external/bsd/atf/lib/libatf-c++: Makefile src/external/bsd/atf/lib/tools: Makefile src/external/bsd/atf/libexec/atf-check: Makefile src/external/bsd/atf/share/doc/atf: Makefile src/external/bsd/atf/share/examples/atf: Makefile src/external/bsd/atf/share/xml/atf: Makefile src/external/bsd/atf/share/xsl/atf: Makefile src/external/bsd/atf/tests/atf: Makefile src/external/bsd/atf/tests/atf/atf-c: Makefile src/external/bsd/atf/tests/atf/atf-c++: Makefile src/external/bsd/atf/tests/atf/atf-c++/detail: Makefile src/external/bsd/atf/tests/atf/atf-c/detail: Makefile src/external/bsd/atf/tests/atf/atf-sh: Makefile src/external/bsd/atf/tests/atf/test-programs: Makefile src/external/bsd/atf/tests/atf/tools: Makefile src/external/bsd/atf/usr.bin/atf-config: Makefile src/external/bsd/atf/usr.bin/atf-report: Makefile src/external/bsd/atf/usr.bin/atf-run: Makefile src/external/bsd/atf/usr.bin/atf-sh: Makefile src/external/bsd/atf/usr.bin/atf-version: Makefile Added Files: src/external/bsd/atf: bconfig.h src/external/bsd/atf/etc: Makefile.inc src/external/bsd/atf/lib/libatf-c: defs.h src/external/bsd/atf/libexec: Makefile.inc src/external/bsd/atf/share: Makefile.inc src/external/bsd/atf/share/doc: Makefile.inc src/external/bsd/atf/share/examples: Makefile.inc src/external/bsd/atf/share/xml: Makefile.inc src/external/bsd/atf/share/xsl: Makefile.inc src/external/bsd/atf/tests: Makefile.inc src/external/bsd/atf/tests/atf: Makefile.inc src/external/bsd/atf/tests/atf/atf-c: Makefile.inc src/external/bsd/atf/tests/atf/atf-c++: Makefile.inc Removed Files: src/external/bsd/atf/lib/libatf-c: bconfig.h Log Message: Homogenize reachover build file structure with that of kyua-cli: - Move the majority of the common build definitions to the top-level Makefile.inc and ensure this gets included everywhere. - Move the bconfig.h file to the top-level directory. - Add a statically-generated defs.h file instead of creating one during the build. Easier to understand and less chances for things to go wrong. - Make sure all files using ATF_VERSION have the right dependency to trigger a rebuild when the value changes. - Clean up stale -I flags. This is all mostly for simplicity reasons and to reduce the cognitive load required to understand the build of the atf and kyua-* packages. I have tested this with both MKKYUA=no/yes and non-clean/clean builds so hopefully I got the details right. But if not, let me know please. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/bconfig.h cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/etc/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/etc/atf/Makefile cvs rdiff -u -r1.18 -r1.19 src/external/bsd/atf/lib/libatf-c/Makefile cvs rdiff -u -r1.14 -r0 src/external/bsd/atf/lib/libatf-c/bconfig.h cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/libatf-c/defs.h cvs rdiff -u -r1.21 -r1.22 src/external/bsd/atf/lib/libatf-c++/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/lib/tools/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/libexec/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/libexec/atf-check/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/doc/Makefile.inc cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/share/doc/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/examples/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/examples/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/xml/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/xml/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/xsl/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/xsl/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/Makefile.inc cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/tests/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/Makefile.inc cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/tests/atf/atf-c/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-c/Makefile.inc cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/tests/atf/atf-c++/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-c++/Makefile.inc cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile cvs rdiff -u -r1.6
CVS commit: src/external/bsd/atf/lib/libatf-c
Module Name:src Committed By: jmmv Date: Sun Feb 9 14:02:39 UTC 2014 Modified Files: src/external/bsd/atf/lib/libatf-c: bconfig.h Log Message: Update for atf 0.19. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/lib/libatf-c/bconfig.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/lib/libatf-c/bconfig.h diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.12 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.13 --- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.12 Fri Feb 15 17:08:34 2013 +++ src/external/bsd/atf/lib/libatf-c/bconfig.h Sun Feb 9 14:02:39 2014 @@ -28,18 +28,9 @@ /* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define to 1 if putenv is in std */ -/* #undef HAVE_PUTENV_IN_STD */ - /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define to 1 if setenv is in std */ -/* #undef HAVE_SETENV_IN_STD */ - -/* Define to 1 if snprintf is in std */ -/* #undef HAVE_SNPRINTF_IN_STD */ - /* Define to 1 if you have the stdint.h header file. */ #define HAVE_STDINT_H 1 @@ -61,15 +52,9 @@ /* Define to 1 if you have the unistd.h header file. */ #define HAVE_UNISTD_H 1 -/* Define to 1 if you have the `unmount' function. */ -#define HAVE_UNMOUNT 1 - /* Define to 1 if you have the `unsetenv' function. */ #define HAVE_UNSETENV 1 -/* Define to 1 if unsetenv is in std */ -/* #undef HAVE_UNSETENV_IN_STD */ - /* Define to 1 if vsnprintf is in std */ /* #undef HAVE_VSNPRINTF_IN_STD */ @@ -80,9 +65,6 @@ */ #define LT_OBJDIR .libs/ -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - /* Name of package */ #define PACKAGE atf @@ -96,19 +78,19 @@ #define PACKAGE_NAME Automated Testing Framework /* Define to the full name and version of this package. */ -#define PACKAGE_STRING Automated Testing Framework 0.17 +#define PACKAGE_STRING Automated Testing Framework 0.19 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME atf /* Define to the home page for this package. */ -#define PACKAGE_URL http://code.google.com/p/kyua/wiki/ATF; +#define PACKAGE_URL https://github.com/jmmv/atf/; /* Define to the version of this package. */ -#define PACKAGE_VERSION 0.17 +#define PACKAGE_VERSION 0.19 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 0.17 +#define VERSION 0.19
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sat Feb 8 19:06:05 UTC 2014
Modified Files:
src/external/bsd/atf: prepare-import.sh
Log Message:
Adjust for import of atf 0.19.
- Delete some unnecessary files.
- Print out both the list of deleted files and added files in the import.
Useful when adjusting file lists and the reachover Makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/prepare-import.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/prepare-import.sh
diff -u src/external/bsd/atf/prepare-import.sh:1.6 src/external/bsd/atf/prepare-import.sh:1.7
--- src/external/bsd/atf/prepare-import.sh:1.6 Mon Jan 16 22:42:40 2012
+++ src/external/bsd/atf/prepare-import.sh Sat Feb 8 19:06:05 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.6 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.7 2014/02/08 19:06:05 jmmv Exp $
#
# Use this script to recreate the 'dist' subdirectory from a newly released
# distfile. The script takes care of unpacking the distfile, removing any
@@ -21,6 +21,7 @@ CLEAN_PATTERNS=${CLEAN_PATTERNS} bconfi
CLEAN_PATTERNS=${CLEAN_PATTERNS} bootstrap
CLEAN_PATTERNS=${CLEAN_PATTERNS} configure*
CLEAN_PATTERNS=${CLEAN_PATTERNS} m4
+CLEAN_PATTERNS=${CLEAN_PATTERNS} tools/generate-revision.sh
err() {
echo ${ProgName}: ${@} 12
@@ -66,26 +67,30 @@ diff_dirs() {
local old_dir=${1}; shift
local new_dir=${1}; shift
- local old_list=$(mktemp -t atf-import.XX)
- local new_list=$(mktemp -t atf-import.XX)
- local diff=$(mktemp -t atf-import.XX)
- trap rm -f '${old_list}' '${new_list}' '${diff}'; exit 1 \
- HUP INT QUIT TERM
+ local tmpdir=$(mktemp -d -t atf-import)
+ trap rm -rf '${tmpdir}'; exit 1 HUP INT QUIT TERM
- ( cd ${old_dir} find . | sort ${old_list} )
- ( cd ${new_dir} find . | sort ${new_list} )
-
- diff -u ${old_list} ${new_list} | grep '^+\.' ${diff} || true
- if [ -s ${diff} ]; then
+ local old_list=${tmpdir}/old-list.txt
+ ( cd ${old_dir} find . -type f | sort ${old_list} )
+ local new_list=${tmpdir}/new-list.txt
+ ( cd ${new_dir} find . -type f | sort ${new_list} )
+
+ local added=${tmpdir}/added.txt
+ comm -13 ${old_list} ${new_list} ${added}
+ local removed=${tmpdir}/removed.txt
+ comm -23 ${old_list} ${new_list} | grep -v '/CVS' ${removed}
+ if [ -s ${removed} ]; then
+ log Removed files found
+ cat ${removed}
+ fi
+ if [ -s ${added} ]; then
log New files found
- diff -u ${old_list} ${new_list} | grep '^+\.'
+ cat ${added}
log Check if any files have to be cleaned up and update \
the prepare-import.sh script accordingly
- else
- log No new files; all good!
fi
- rm -f ${old_list} ${new_list} ${diff}
+ rm -rf ${tmpdir}
}
main() {
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sat Feb 8 19:15:34 UTC 2014
Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/etc/atf: Makefile
src/external/bsd/atf/lib: Makefile
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile shlib_version
src/external/bsd/atf/share/doc/atf: Makefile
src/external/bsd/atf/share/examples/atf: Makefile
src/external/bsd/atf/share/xml/atf: Makefile
src/external/bsd/atf/share/xsl/atf: Makefile
src/external/bsd/atf/tests/atf: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-c++/detail: Makefile
src/external/bsd/atf/tests/atf/atf-c/detail: Makefile
src/external/bsd/atf/usr.bin/atf-config: Makefile
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Added Files:
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/atf/tests/atf/tools: Makefile
Log Message:
Adjust reachover Makefiles for atf-0.19.
The main change here is that the atf-config, atf-report, atf-run and
atf-version tools no longer depend on libatf-c nor libatf-c++. Instead,
they depend on an internal libtools.a that contains code specifically
for these tools and nothing else, making them self-contained.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/etc/atf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/lib/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/lib/libatf-c++/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/share/examples/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/share/xml/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/share/xsl/atf/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
cvs rdiff -u -r0 -r1.3 src/external/bsd/atf/tests/atf/tools/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/usr.bin/atf-version/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.1 src/external/bsd/atf/Makefile.inc:1.2
--- src/external/bsd/atf/Makefile.inc:1.1 Thu Mar 14 07:10:05 2013
+++ src/external/bsd/atf/Makefile.inc Sat Feb 8 19:15:33 2014
@@ -1,7 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/03/14 07:10:05 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.2 2014/02/08 19:15:33 jmmv Exp $
TOPDIR= ${NETBSDSRCDIR}/external/bsd/atf
SRCDIR= ${TOPDIR}/dist
ATF_VERSION!= grep 'define VERSION' ${TOPDIR}/lib/libatf-c/bconfig.h \
| cut -d '' -f 2
+
+.if defined(USE_ATF_LIBTOOLS)
+PRIVATELIBDIR!= cd ${TOPDIR}/lib; ${PRINTOBJDIR}
+CPPFLAGS+= -I${PRIVATELIBDIR}/tools
+LDADD+= ${PRIVATELIBDIR}/tools/libtools.a
+DPADD+= ${PRIVATELIBDIR}/tools/libtools.a
+.endif
Index: src/external/bsd/atf/etc/atf/Makefile
diff -u src/external/bsd/atf/etc/atf/Makefile:1.3 src/external/bsd/atf/etc/atf/Makefile:1.4
--- src/external/bsd/atf/etc/atf/Makefile:1.3 Sun Nov 7 17:46:45 2010
+++ src/external/bsd/atf/etc/atf/Makefile Sat Feb 8 19:15:33 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/11/07 17:46:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:33 jmmv Exp $
.include bsd.own.mk
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-run/sample
+.PATH: ${SRCDIR}/tools/sample
CONFIGFILES= NetBSD.conf atf-run.hooks common.conf
FILESDIR= /etc/atf
Index: src/external/bsd/atf/lib/Makefile
diff -u src/external/bsd/atf/lib/Makefile:1.1 src/external/bsd/atf/lib/Makefile:1.2
--- src/external/bsd/atf/lib/Makefile:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/lib/Makefile Sat Feb 8 19:15:33 2014
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2014/02/08 19:15:33 jmmv Exp $
-SUBDIR= libatf-c .WAIT libatf-c++
+SUBDIR= libatf-c .WAIT libatf-c++ tools
.include bsd.subdir.mk
Index: src/external/bsd/atf/lib/libatf-c/Makefile
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: christos
Date: Fri Jan 10 01:16:07 UTC 2014
Modified Files:
src/external/bsd/atf/dist/atf-sh: libatf-sh.subr
Log Message:
Make cleanup work as documented; note there are no tests testing that cleanup
works.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
diff -u src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.1.1.5 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.2
--- src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.1.1.5 Mon Jan 16 17:36:53 2012
+++ src/external/bsd/atf/dist/atf-sh/libatf-sh.subr Thu Jan 9 20:16:07 2014
@@ -772,6 +772,7 @@ main()
_atf_syntax_error Cannot provide more than one test case name
else
_atf_run_tc ${1}
+_atf_run_tc ${1}:cleanup
fi
fi
}
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: joerg
Date: Tue Jan 7 02:06:42 UTC 2014
Modified Files:
src/external/bsd/atf/dist/atf-c: error.h tc.c tc.h
src/external/bsd/atf/dist/atf-c++: tests.cpp
src/external/bsd/atf/dist/atf-c/detail: dynstr.c dynstr.h fs.c fs.h
sanity.c test_helpers.c text.h tp_main.c
Log Message:
Format string annotations and fixes for resulting fallout.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/atf/dist/atf-c/error.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/dist/atf-c/tc.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/tc.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/dist/atf-c++/tests.cpp
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-c/detail/dynstr.c \
src/external/bsd/atf/dist/atf-c/detail/dynstr.h \
src/external/bsd/atf/dist/atf-c/detail/fs.c \
src/external/bsd/atf/dist/atf-c/detail/fs.h \
src/external/bsd/atf/dist/atf-c/detail/text.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/atf-c/detail/sanity.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/atf/dist/atf-c/detail/tp_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/error.h
diff -u src/external/bsd/atf/dist/atf-c/error.h:1.1.1.4 src/external/bsd/atf/dist/atf-c/error.h:1.2
--- src/external/bsd/atf/dist/atf-c/error.h:1.1.1.4 Mon Jan 16 22:36:30 2012
+++ src/external/bsd/atf/dist/atf-c/error.h Tue Jan 7 02:06:42 2014
@@ -33,6 +33,7 @@
#include stdbool.h
#include stddef.h
+#include atf-c/defs.h
#include atf-c/error_fwd.h
/* -
@@ -62,7 +63,8 @@ void atf_error_format(const atf_error_t,
* Common error types.
* - */
-atf_error_t atf_libc_error(int, const char *, ...);
+atf_error_t atf_libc_error(int, const char *, ...)
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
int atf_libc_error_code(const atf_error_t);
const char *atf_libc_error_msg(const atf_error_t);
Index: src/external/bsd/atf/dist/atf-c/tc.c
diff -u src/external/bsd/atf/dist/atf-c/tc.c:1.12 src/external/bsd/atf/dist/atf-c/tc.c:1.13
--- src/external/bsd/atf/dist/atf-c/tc.c:1.12 Mon Jan 16 22:41:30 2012
+++ src/external/bsd/atf/dist/atf-c/tc.c Tue Jan 7 02:06:42 2014
@@ -79,12 +79,14 @@ struct context {
static void context_init(struct context *, const atf_tc_t *, const char *);
static void check_fatal_error(atf_error_t);
static void report_fatal_error(const char *, ...)
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2)
ATF_DEFS_ATTRIBUTE_NORETURN;
static atf_error_t write_resfile(const int, const char *, const int,
const atf_dynstr_t *);
static void create_resfile(const char *, const char *, const int,
atf_dynstr_t *);
static void error_in_expect(struct context *, const char *, ...)
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3)
ATF_DEFS_ATTRIBUTE_NORETURN;
static void validate_expect(struct context *);
static void expected_failure(struct context *, atf_dynstr_t *)
@@ -97,9 +99,11 @@ static void pass(struct context *)
static void skip(struct context *, atf_dynstr_t *)
ATF_DEFS_ATTRIBUTE_NORETURN;
static void format_reason_ap(atf_dynstr_t *, const char *, const size_t,
- const char *, va_list);
+ const char *, va_list)
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(4, 0);
static void format_reason_fmt(atf_dynstr_t *, const char *, const size_t,
- const char *, ...);
+ const char *, ...)
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(4, 5);
static void errno_test(struct context *, const char *, const size_t,
const int, const char *, const bool,
void (*)(struct context *, atf_dynstr_t *));
@@ -571,7 +575,7 @@ atf_tc_init(atf_tc_t *tc, const char *id
if (atf_is_error(err))
goto err_vars;
-err = atf_tc_set_md_var(tc, ident, ident);
+err = atf_tc_set_md_var(tc, ident, %s, ident);
if (atf_is_error(err))
goto err_map;
@@ -787,28 +791,35 @@ atf_tc_set_md_var(atf_tc_t *tc, const ch
* - */
static void _atf_tc_fail(struct context *, const char *, va_list)
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0)
ATF_DEFS_ATTRIBUTE_NORETURN;
-static void _atf_tc_fail_nonfatal(struct context *, const char *, va_list);
+static void _atf_tc_fail_nonfatal(struct context *, const char *, va_list)
+ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 0);
static void _atf_tc_fail_check(struct context *, const char *, const size_t,
-const char *, va_list);
+const char *, va_list)
+
CVS commit: src/external/bsd/atf/dist/atf-c++/detail
Module Name:src
Committed By: joerg
Date: Tue Apr 30 00:31:56 UTC 2013
Modified Files:
src/external/bsd/atf/dist/atf-c++/detail: parser.hpp
Log Message:
It is unclear whether cin is guaranteed to buffer the last input
character of a get() for ungetch() to work. Prefer putback() to make it
work with current implementations of cin in libc++. Tracked as
http://llvm.org/bugs/show_bug.cgi?id=15867 with test case.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/atf/dist/atf-c++/detail/parser.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c++/detail/parser.hpp
diff -u src/external/bsd/atf/dist/atf-c++/detail/parser.hpp:1.1.1.2 src/external/bsd/atf/dist/atf-c++/detail/parser.hpp:1.2
--- src/external/bsd/atf/dist/atf-c++/detail/parser.hpp:1.1.1.2 Mon Jan 16 22:36:46 2012
+++ src/external/bsd/atf/dist/atf-c++/detail/parser.hpp Tue Apr 30 00:31:56 2013
@@ -259,7 +259,7 @@ tokenizer IS ::next(void)
t = token(m_lineno, m_text_type, text);
quoted = true;
} else {
-m_is.unget();
+m_is.putback(ch);
done = true;
}
} else {
@@ -271,13 +271,13 @@ tokenizer IS ::next(void)
t = token(m_lineno, (*idelim).second,
std::string() + ch);
else
-m_is.unget();
+m_is.putback(ch);
} else if (ch == '\n') {
done = true;
if (text.empty())
t = token(m_lineno, m_nl_type, NEWLINE);
else
-m_is.unget();
+m_is.putback(ch);
} else if (m_skipws (ch == ' ' || ch == '\t')) {
if (!text.empty())
done = true;
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Sat Mar 16 04:21:19 UTC 2013
Modified Files:
src/external/bsd/atf/dist/atf-c: pkg_config_test.sh
src/external/bsd/atf/dist/atf-c++: pkg_config_test.sh
Log Message:
Mark the atf/atf-{c,c++}/pkg_config_test:version tests as needing atf-version.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-c/pkg_config_test.sh
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/pkg_config_test.sh
diff -u src/external/bsd/atf/dist/atf-c/pkg_config_test.sh:1.1.1.3 src/external/bsd/atf/dist/atf-c/pkg_config_test.sh:1.2
--- src/external/bsd/atf/dist/atf-c/pkg_config_test.sh:1.1.1.3 Mon Jan 16 22:36:32 2012
+++ src/external/bsd/atf/dist/atf-c/pkg_config_test.sh Sat Mar 16 04:21:19 2013
@@ -59,7 +59,7 @@ atf_test_case version
version_head()
{
atf_set descr Checks that the version in atf-c is correct
-atf_set require.progs pkg-config
+atf_set require.progs atf-version pkg-config
}
version_body()
{
Index: src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh
diff -u src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh:1.1.1.4 src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh:1.2
--- src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh:1.1.1.4 Mon Jan 16 22:36:45 2012
+++ src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh Sat Mar 16 04:21:19 2013
@@ -59,7 +59,7 @@ atf_test_case version
version_head()
{
atf_set descr Checks that the version in atf-c++ is correct
-atf_set require.progs pkg-config
+atf_set require.progs atf-version pkg-config
}
version_body()
{
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Thu Mar 14 07:10:07 UTC 2013
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Added Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/lib: Makefile.inc
src/external/bsd/atf/usr.bin: Makefile.inc
Log Message:
Deduce the version number to encode in pkgconfig files by getting it from
bconfig.h. Also make the build of these files depends on bconfig.h itself.
This should fix once and for all the problems of the
atf/atf-{c,c++}/pkg_config_test:version tests breaking because the
pkgconfig files hold an old version number during update builds.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/Makefile.inc
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/usr.bin/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/usr.bin/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.16 src/external/bsd/atf/lib/libatf-c/Makefile:1.17
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.16 Tue Feb 19 15:35:42 2013
+++ src/external/bsd/atf/lib/libatf-c/Makefile Thu Mar 14 07:10:06 2013
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2013/02/19 15:35:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2013/03/14 07:10:06 jmmv Exp $
NOLINT= # defined
-.include bsd.own.mk
+.include bsd.init.mk
LIB= atf-c
CWARNFLAGS+= -Wno-missing-noreturn
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c
.PATH: ${SRCDIR}/atf-c/detail
@@ -88,8 +87,8 @@ FILES+= atf-c.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
-atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-c.pc: Makefile atf-c.pc.in bconfig.h
+ ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.18 src/external/bsd/atf/lib/libatf-c++/Makefile:1.19
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.18 Tue Feb 19 15:35:43 2013
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Thu Mar 14 07:10:06 2013
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/02/19 15:35:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2013/03/14 07:10:06 jmmv Exp $
NOLINT= # defined
-.include bsd.own.mk
+.include bsd.init.mk
LIB= atf-c++
LIBISCXX= yes
@@ -16,10 +16,10 @@ LIBDPLIBS+= stdc++ ${.CURDIR}/../../
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c++
.PATH: ${SRCDIR}/atf-c++/detail
+.PATH: ${TOPDIR}/lib/libatf-c # For bconfig.h
CPPFLAGS+= -I${.CURDIR}/../libatf-c
CPPFLAGS+= -I.
@@ -62,8 +62,8 @@ FILES+= atf-c++.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
-atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-c++.pc: Makefile atf-c++.pc.in bconfig.h
+ ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.8 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.9
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.8 Tue Feb 19 15:35:43 2013
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Thu Mar 14 07:10:07 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2013/02/19 15:35:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2013/03/14 07:10:07 jmmv Exp $
-.include bsd.own.mk
+.include bsd.init.mk
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-sh
+.PATH: ${TOPDIR}/lib/libatf-c # For bconfig.h.
BINDIR= /usr/bin
PROG_CXX= atf-sh
@@ -28,8 +28,8 @@ FILES+= atf-sh.pc
FILESDIR_atf-sh.pc= /usr/lib/pkgconfig
realall: atf-sh.pc
-atf-sh.pc: Makefile atf-sh.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
+atf-sh.pc: Makefile atf-sh.pc.in bconfig.h
+ ${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__EXEC_PREFIX__,/usr,g' \
${SRCDIR}/atf-sh/atf-sh.pc.in atf-sh.pc
CLEANFILES+= atf-sh.pc
Added files:
Index: src/external/bsd/atf/Makefile.inc
diff -u /dev/null src/external/bsd/atf/Makefile.inc:1.1
--- /dev/null Thu Mar 14 07:10:07 2013
+++ src/external/bsd/atf/Makefile.inc Thu Mar 14 07:10:05 2013
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/03/14 07:10:05 jmmv
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Mon Feb 25 00:22:11 UTC 2013
Modified Files:
src/external/bsd/atf/etc: Makefile
src/external/bsd/atf/share: Makefile
src/external/bsd/atf/tests/atf: Makefile
src/external/bsd/atf/usr.bin: Makefile
Log Message:
Do not install atf-config, atf-report, atf-run nor atf-version when
MKKYUA!=no. The newly imported kyua-atf-compat module provides a
backwards-compatibility implementation of atf-report and atf-run
based on kyua(1).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/etc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/etc/Makefile
diff -u src/external/bsd/atf/etc/Makefile:1.1 src/external/bsd/atf/etc/Makefile:1.2
--- src/external/bsd/atf/etc/Makefile:1.1 Mon Jan 19 07:13:03 2009
+++ src/external/bsd/atf/etc/Makefile Mon Feb 25 00:22:10 2013
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2013/02/25 00:22:10 jmmv Exp $
+.include bsd.init.mk
+
+.if !(${MKKYUA} != no)
SUBDIR= atf
+.endif
.include bsd.subdir.mk
Index: src/external/bsd/atf/share/Makefile
diff -u src/external/bsd/atf/share/Makefile:1.2 src/external/bsd/atf/share/Makefile:1.3
--- src/external/bsd/atf/share/Makefile:1.2 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/share/Makefile Mon Feb 25 00:22:11 2013
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/25 00:22:11 jmmv Exp $
-SUBDIR= doc examples xml xsl
+.include bsd.init.mk
+
+SUBDIR= doc
+.if !(${MKKYUA} != no)
+SUBDIR+= examples xml xsl
+.endif
.include bsd.subdir.mk
Index: src/external/bsd/atf/tests/atf/Makefile
diff -u src/external/bsd/atf/tests/atf/Makefile:1.6 src/external/bsd/atf/tests/atf/Makefile:1.7
--- src/external/bsd/atf/tests/atf/Makefile:1.6 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/tests/atf/Makefile Mon Feb 25 00:22:11 2013
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2013/02/25 00:22:11 jmmv Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/atf
-ATFFILE= yes
-SUBDIR= atf-c \
+TESTS_SUBDIRS= atf-c \
atf-c++ \
- atf-config \
- atf-report \
- atf-run \
atf-sh \
test-programs
+.if !(${MKKYUA} != no)
+TESTS_SUBDIRS+= atf-config \
+ atf-report \
+ atf-run
+.endif
+
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
Index: src/external/bsd/atf/usr.bin/Makefile
diff -u src/external/bsd/atf/usr.bin/Makefile:1.3 src/external/bsd/atf/usr.bin/Makefile:1.4
--- src/external/bsd/atf/usr.bin/Makefile:1.3 Wed Oct 20 09:20:12 2010
+++ src/external/bsd/atf/usr.bin/Makefile Mon Feb 25 00:22:11 2013
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2013/02/25 00:22:11 jmmv Exp $
-SUBDIR= atf-config atf-report atf-run atf-sh atf-version
+.include bsd.init.mk
+
+SUBDIR= atf-sh
+.if !(${MKKYUA} != no)
+SUBDIR+= atf-config atf-report atf-run atf-version
+.endif
.include bsd.subdir.mk
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 19 15:35:43 UTC 2013
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Log Message:
Fix atf version in pkgconfig files (should be 0.17).
Keeping these files up to date with every new import is too easy to get
wrong. Would be nice if we'd extract the version number in some other
manner, like from lib/libatf-c/bconfig.h.
Found by martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/usr.bin/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.15 src/external/bsd/atf/lib/libatf-c/Makefile:1.16
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.15 Wed Jul 11 22:40:16 2012
+++ src/external/bsd/atf/lib/libatf-c/Makefile Tue Feb 19 15:35:42 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/07/11 22:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2013/02/19 15:35:42 jmmv Exp $
NOLINT= # defined
@@ -89,7 +89,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.17 src/external/bsd/atf/lib/libatf-c++/Makefile:1.18
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.17 Fri Feb 15 17:08:35 2013
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Tue Feb 19 15:35:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/02/15 17:08:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2013/02/19 15:35:43 jmmv Exp $
NOLINT= # defined
@@ -63,7 +63,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.7 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.8
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.7 Wed Jul 11 22:40:16 2012
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Tue Feb 19 15:35:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/07/11 22:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2013/02/19 15:35:43 jmmv Exp $
.include bsd.own.mk
@@ -29,7 +29,7 @@ FILESDIR_atf-sh.pc= /usr/lib/pkgconfig
realall: atf-sh.pc
atf-sh.pc: Makefile atf-sh.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.17,g' \
-e 's,__EXEC_PREFIX__,/usr,g' \
${SRCDIR}/atf-sh/atf-sh.pc.in atf-sh.pc
CLEANFILES+= atf-sh.pc
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Fri Feb 15 17:04:22 UTC 2013 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9795 Log Message: Import atf 0.17: Experimental version released on February 14th, 2013. * Added the atf_utils_cat_file, atf_utils_compare_file, atf_utils_copy_file, atf_utils_create_file, atf_utils_file_exists, atf_utils_fork, atf_utils_grep_file, atf_utils_grep_string, atf_utils_readline, atf_utils_redirect and atf_utils_wait utility functions to atf-c-api. Documented the already-public atf_utils_free_charpp function. * Added the cat_file, compare_file, copy_file, create_file, file_exists, fork, grep_collection, grep_file, grep_string, redirect and wait functions to the atf::utils namespace of atf-c++-api. These are wrappers around the same functions added to the atf-c-api library. * Added the ATF_CHECK_MATCH, ATF_CHECK_MATCH_MSG, ATF_REQUIRE_MATCH and ATF_REQUIRE_MATCH_MSG macros to atf-c to simplify the validation of a string against a regular expression. * Miscellaneous fixes for manpage typos and compilation problems with clang. * Added caching of the results of those configure tests that rely on executing a test program. This should help crossbuild systems by providing a mechanism to pre-specify what the results should be. * PR bin/45690: Make atf-report convert any non-printable characters to a plain-text representation (matching their corresponding hexadecimal entities) in XML output files. This is to prevent the output of test cases from breaking xsltproc later. Status: Vendor Tag: TNF Release Tags: atf-0-17 U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Kyuafile U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/Atffile U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/error.h C src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/utils.h U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh U src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c U src/external/bsd/atf/dist/atf-c/error.c U src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tp.c U src/external/bsd/atf/dist/atf-c/utils.c U src/external/bsd/atf/dist/atf-c/h_build.h U src/external/bsd/atf/dist/atf-c/atf_c_test.c U src/external/bsd/atf/dist/atf-c/build_test.c U src/external/bsd/atf/dist/atf-c/check_test.c U src/external/bsd/atf/dist/atf-c/config_test.c U src/external/bsd/atf/dist/atf-c/tc_test.c U src/external/bsd/atf/dist/atf-c/error_test.c C src/external/bsd/atf/dist/atf-c/macros_test.c U src/external/bsd/atf/dist/atf-c/tp_test.c U src/external/bsd/atf/dist/atf-c/utils_test.c U src/external/bsd/atf/dist/atf-c/atf-c.pc.in U src/external/bsd/atf/dist/atf-c/Atffile U src/external/bsd/atf/dist/atf-c/Kyuafile U src/external/bsd/atf/dist/atf-c/macros_h_test.c U src/external/bsd/atf/dist/atf-c/unused_test.c U src/external/bsd/atf/dist/atf-c/detail/process_helpers.c C src/external/bsd/atf/dist/atf-c/detail/test_helpers.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers.h U src/external/bsd/atf/dist/atf-c/detail/dynstr.c U src/external/bsd/atf/dist/atf-c/detail/dynstr.h U src/external/bsd/atf/dist/atf-c/detail/env.c U src/external/bsd/atf/dist/atf-c/detail/env.h U src/external/bsd/atf/dist/atf-c/detail/fs.c U src/external/bsd/atf/dist/atf-c/detail/fs.h U src/external/bsd/atf/dist/atf-c/detail/list.c U src/external/bsd/atf/dist/atf-c/detail/list.h U src/external/bsd/atf/dist/atf-c/detail/map.c U src/external/bsd/atf/dist/atf-c/detail/map.h U src/external/bsd/atf/dist/atf-c/detail/process.c U src/external/bsd/atf/dist/atf-c/detail/process.h U src/external/bsd/atf/dist/atf-c/detail/sanity.c U src/external/bsd/atf/dist/atf-c/detail/sanity.h U src/external/bsd/atf/dist/atf-c/detail/text.c U src/external/bsd/atf/dist/atf-c/detail/text.h U src/external/bsd/atf/dist/atf-c/detail/tp_main.c U src/external/bsd/atf/dist/atf-c/detail/user.c U src/external/bsd/atf/dist/atf-c/detail/user.h U src/external/bsd/atf/dist/atf-c/detail/dynstr_test.c U src/external/bsd/atf/dist/atf-c/detail/env_test.c U src/external/bsd/atf/dist/atf-c/detail/fs_test.c U src/external/bsd/atf/dist/atf-c/detail/list_test.c U src/external/bsd/atf/dist/atf-c/detail/map_test.c C src/external/bsd/atf/dist/atf-c/detail/process_test.c U src/external/bsd/atf/dist/atf-c/detail/sanity_test.c U src/external/bsd/atf/dist/atf-c/detail/text_test.c
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Fri Feb 15 17:08:01 UTC 2013 Modified Files: src/external/bsd/atf/dist/atf-c: atf-c-api.3 macros_test.c src/external/bsd/atf/dist/atf-c++: tests.cpp tests.hpp src/external/bsd/atf/dist/atf-c++/detail: process.hpp src/external/bsd/atf/dist/atf-c/detail: process_test.c test_helpers.c src/external/bsd/atf/dist/atf-report: atf-report.cpp src/external/bsd/atf/dist/atf-run: fs.cpp timer.hpp src/external/bsd/atf/dist/atf-sh: atf-check.cpp atf-check_test.sh src/external/bsd/atf/dist/doc: atf-test-case.4 Removed Files: src/external/bsd/atf/dist/atf-c/detail: test_helpers_test.c src/external/bsd/atf/dist/test-programs: fork_test.sh Log Message: Fix merge conflicts after import of atf 0.17. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-c/atf-c-api.3 \ src/external/bsd/atf/dist/atf-c/macros_test.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/dist/atf-c++/tests.cpp cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/atf-c++/tests.hpp cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c++/detail/process.hpp cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/atf/dist/atf-c/detail/process_test.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/atf/dist/atf-c/detail/test_helpers.c cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/atf/dist/atf-c/detail/test_helpers_test.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/atf-report/atf-report.cpp cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-run/fs.cpp cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-run/timer.hpp cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/dist/atf-sh/atf-check.cpp cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/atf-sh/atf-check_test.sh cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/doc/atf-test-case.4 cvs rdiff -u -r1.1.1.3 -r0 \ src/external/bsd/atf/dist/test-programs/fork_test.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/atf-c-api.3 diff -u src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.2 src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.3 --- src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.2 Wed Sep 26 23:27:34 2012 +++ src/external/bsd/atf/dist/atf-c/atf-c-api.3 Fri Feb 15 17:07:59 2013 @@ -26,14 +26,17 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 26, 2010 +.Dd November 30, 2012 .Dt ATF-C-API 3 .Os .Sh NAME +.Nm atf-c-api , .Nm ATF_CHECK , .Nm ATF_CHECK_MSG , .Nm ATF_CHECK_EQ , .Nm ATF_CHECK_EQ_MSG , +.Nm ATF_CHECK_MATCH , +.Nm ATF_CHECK_MATCH_MSG , .Nm ATF_CHECK_STREQ , .Nm ATF_CHECK_STREQ_MSG , .Nm ATF_CHECK_ERRNO , @@ -41,6 +44,8 @@ .Nm ATF_REQUIRE_MSG , .Nm ATF_REQUIRE_EQ , .Nm ATF_REQUIRE_EQ_MSG , +.Nm ATF_REQUIRE_MATCH , +.Nm ATF_REQUIRE_MATCH_MSG , .Nm ATF_REQUIRE_STREQ , .Nm ATF_REQUIRE_STREQ_MSG , .Nm ATF_REQUIRE_ERRNO , @@ -72,7 +77,19 @@ .Nm atf_tc_fail , .Nm atf_tc_fail_nonfatal , .Nm atf_tc_pass , -.Nm atf_tc_skip +.Nm atf_tc_skip , +.Nm atf_utils_cat_file , +.Nm atf_utils_compare_file , +.Nm atf_utils_copy_file , +.Nm atf_utils_create_file , +.Nm atf_utils_file_exists , +.Nm atf_utils_fork , +.Nm atf_utils_free_charpp , +.Nm atf_utils_grep_file , +.Nm atf_utils_grep_string , +.Nm atf_utils_readline , +.Nm atf_utils_redirect , +.Nm atf_utils_wait .Nd C API to write ATF-based test programs .Sh SYNOPSIS .In atf-c.h @@ -80,6 +97,8 @@ .Fn ATF_CHECK_MSG expression fail_msg_fmt ... .Fn ATF_CHECK_EQ expression_1 expression_2 .Fn ATF_CHECK_EQ_MSG expression_1 expression_2 fail_msg_fmt ... +.Fn ATF_CHECK_MATCH regexp string +.Fn ATF_CHECK_MATCH_MSG regexp string fail_msg_fmt ... .Fn ATF_CHECK_STREQ string_1 string_2 .Fn ATF_CHECK_STREQ_MSG string_1 string_2 fail_msg_fmt ... .Fn ATF_CHECK_ERRNO exp_errno bool_expression @@ -87,6 +106,8 @@ .Fn ATF_REQUIRE_MSG expression fail_msg_fmt ... .Fn ATF_REQUIRE_EQ expression_1 expression_2 .Fn ATF_REQUIRE_EQ_MSG expression_1 expression_2 fail_msg_fmt ... +.Fn ATF_REQUIRE_MATCH regexp string +.Fn ATF_REQUIRE_MATCH_MSG regexp string fail_msg_fmt ... .Fn ATF_REQUIRE_STREQ string_1 string_2 .Fn ATF_REQUIRE_STREQ_MSG string_1 string_2 fail_msg_fmt ... .Fn ATF_REQUIRE_ERRNO exp_errno bool_expression @@ -119,6 +140,67 @@ .Fn atf_tc_fail_nonfatal reason .Fn atf_tc_pass .Fn atf_tc_skip reason +.Ft void +.Fo atf_utils_cat_file +.Fa const char *file +.Fa const char *prefix +.Fc +.Ft bool +.Fo atf_utils_compare_file +.Fa const char *file +.Fa const char *contents +.Fc +.Ft void +.Fo atf_utils_copy_file +.Fa const char *source +.Fa const char *destination +.Fc +.Ft void +.Fo atf_utils_create_file +.Fa const char *file +.Fa const char *contents +.Fa ... +.Fc +.Ft void +.Fo atf_utils_file_exists +.Fa const char *file +.Fc +.Ft pid_t +.Fo atf_utils_fork +.Fa
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Fri Feb 15 17:08:35 UTC 2013
Modified Files:
src/external/bsd/atf/lib/libatf-c: bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-c++/detail: Makefile
src/external/bsd/atf/tests/atf/atf-c/detail: Makefile
src/external/bsd/atf/tests/atf/test-programs: Makefile
Log Message:
Update reachover Makefiles for atf 0.17.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/atf/tests/atf/test-programs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.11 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.12
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.11 Wed Jul 11 22:40:16 2012
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Fri Feb 15 17:08:34 2013
@@ -23,7 +23,7 @@
#define HAVE_MEMORY_H 1
/* Define to 1 if getopt has optreset */
-/* #undef HAVE_OPTRESET */
+#define HAVE_OPTRESET 1
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
@@ -96,7 +96,7 @@
#define PACKAGE_NAME Automated Testing Framework
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING Automated Testing Framework 0.16
+#define PACKAGE_STRING Automated Testing Framework 0.17
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME atf
@@ -105,10 +105,10 @@
#define PACKAGE_URL http://code.google.com/p/kyua/wiki/ATF;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 0.16
+#define PACKAGE_VERSION 0.17
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 0.16
+#define VERSION 0.17
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.16 src/external/bsd/atf/lib/libatf-c++/Makefile:1.17
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.16 Sun Jul 15 00:05:51 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Fri Feb 15 17:08:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/07/15 00:05:51 abs Exp $
+# $NetBSD: Makefile,v 1.17 2013/02/15 17:08:35 jmmv Exp $
NOLINT= # defined
@@ -40,12 +40,14 @@ SRCS= application.cpp \
process.cpp \
tests.cpp \
text.cpp \
- ui.cpp
+ ui.cpp \
+ utils.cpp
INCS= build.hpp \
check.hpp \
config.hpp \
macros.hpp \
+ noncopyable.hpp \
tests.hpp \
utils.hpp
INCSDIR= /usr/include/atf-c++
Index: src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile:1.1 src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile:1.2
--- src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile:1.1 Wed Oct 20 09:20:11 2010
+++ src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile Fri Feb 15 17:08:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2013/02/15 17:08:35 jmmv Exp $
.include bsd.own.mk
@@ -13,6 +13,7 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-
TESTS_CXX=
.for test in application_test \
+ auto_array_test \
env_test \
exceptions_test \
expand_test \
Index: src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.3 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.4
--- src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.3 Fri Aug 10 17:12:11 2012
+++ src/external/bsd/atf/tests/atf/atf-c/detail/Makefile Fri Feb 15 17:08:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/08/10 17:12:11 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2013/02/15 17:08:35 jmmv Exp $
.include bsd.own.mk
@@ -24,7 +24,6 @@ TESTS_C=
map_test \
process_test \
sanity_test \
- test_helpers_test \
text_test \
user_test
TESTS_C+= ${test}
Index: src/external/bsd/atf/tests/atf/test-programs/Makefile
diff -u src/external/bsd/atf/tests/atf/test-programs/Makefile:1.2 src/external/bsd/atf/tests/atf/test-programs/Makefile:1.3
--- src/external/bsd/atf/tests/atf/test-programs/Makefile:1.2 Tue Jul 13 21:12:39 2010
+++ src/external/bsd/atf/tests/atf/test-programs/Makefile Fri Feb 15 17:08:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/13 21:12:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/15 17:08:35 jmmv Exp $
.include bsd.own.mk
@@ -16,8 +16,7 @@ TESTS_C= c_helpers
TESTS_CXX= cpp_helpers
TESTS_SH= sh_helpers
-.for t in config_test expect_test fork_test meta_data_test result_test \
-
CVS commit: src/external/bsd/atf/dist/atf-c
Module Name:src Committed By: joerg Date: Wed Sep 26 23:27:34 UTC 2012 Modified Files: src/external/bsd/atf/dist/atf-c: atf-c-api.3 Log Message: now sense - no sense To generate a diff of this commit: cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/atf/dist/atf-c/atf-c-api.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/atf-c-api.3 diff -u src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.1.1.7 src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.2 --- src/external/bsd/atf/dist/atf-c/atf-c-api.3:1.1.1.7 Mon Jan 16 22:36:31 2012 +++ src/external/bsd/atf/dist/atf-c/atf-c-api.3 Wed Sep 26 23:27:34 2012 @@ -382,7 +382,7 @@ variant of the macros immediately abort condition is detected by calling the .Fn atf_tc_fail function. -Use this variant whenever it makes now sense to continue the execution of a +Use this variant whenever it makes no sense to continue the execution of a test case when the checked condition is not met. The .Sq CHECK
CVS commit: src/external/bsd/atf/tests/atf/atf-c/detail
Module Name:src
Committed By: joerg
Date: Fri Aug 10 17:12:12 UTC 2012
Modified Files:
src/external/bsd/atf/tests/atf/atf-c/detail: Makefile
Log Message:
Clang supports -Wno-stack-protector.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.2 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.3
--- src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.2 Mon Jul 18 19:30:49 2011
+++ src/external/bsd/atf/tests/atf/atf-c/detail/Makefile Fri Aug 10 17:12:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/07/18 19:30:49 tron Exp $
+# $NetBSD: Makefile,v 1.3 2012/08/10 17:12:11 joerg Exp $
.include bsd.own.mk
@@ -34,8 +34,6 @@ SRCS.${test}= ${test}.c test_helpers.c
# Don't warn about functions which cannot be stack smash protected as
# there are a lot of them.
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.dynstr_test.c= -Wno-stack-protector
-.endif
.include bsd.test.mk
CVS commit: src/external/bsd/atf/lib/libatf-c++
Module Name:src
Committed By: abs
Date: Sun Jul 15 00:05:51 UTC 2012
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
Log Message:
Check for ${HAVE_GCC} and pick the right path to stdc++
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/atf/lib/libatf-c++/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.15 src/external/bsd/atf/lib/libatf-c++/Makefile:1.16
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.15 Thu Jul 12 22:15:29 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Jul 15 00:05:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/07/12 22:15:29 christos Exp $
+# $NetBSD: Makefile,v 1.16 2012/07/15 00:05:51 abs Exp $
NOLINT= # defined
@@ -8,7 +8,11 @@ LIB= atf-c++
LIBISCXX= yes
LIBDPLIBS+= atf-c ${.CURDIR}/../libatf-c
+.if ${HAVE_GCC} == 4
+LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
+.else
LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+.endif
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
CVS commit: src/external/bsd/atf/lib/libatf-c++
Module Name:src
Committed By: christos
Date: Thu Jul 12 16:15:40 UTC 2012
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
Log Message:
Properly include dependent library, unbreaks objdir build.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/atf/lib/libatf-c++/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.13 src/external/bsd/atf/lib/libatf-c++/Makefile:1.14
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.13 Wed Jul 11 18:40:16 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Thu Jul 12 12:15:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/07/11 22:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2012/07/12 16:15:40 christos Exp $
NOLINT= # defined
@@ -6,8 +6,8 @@ NOLINT= # defined
LIB= atf-c++
LIBISCXX= yes
-LDADD= -L${.OBJDIR}/../libatf-c -latf-c
-DPADD= ${LIBATF_C}
+
+LIBDPLIBS+= atf-c ${.CURDIR}/../libatf-c
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Wed Jul 11 22:37:16 UTC 2012 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29292 Log Message: Import atf 0.16: Experimental version released on July 10th, 2012. * Added a --enable-tools flag to configure to request the build of the deprecated ATF tools, whose build is now disabled by default. In order to continue running tests, you should migrate to Kyua instead of enabling the build of the deprecated tools. The kyua-atf-compat package provides transitional compatibility versions of atf-run and atf-report built on top of Kyua. * Tweaked the ATF_TEST_CASE macro of atf-c++ so that the compiler can detect defined but unused test cases. * PR bin/45859: Fixed some XSLT bugs that resulted in the tc-time and tp-time XML tags leaking into the generated HTML file. Also improved the CSS file slightly to correct alignment and color issues with the timestamps column. * Optimized atf-c++/macros.hpp so that GNU G++ consumes less memory during compilation with GNU G++. * Flipped the default to building shared libraries for atf-c and atf-c++, and started versioning them. As a side-effect, this removes the --enable-unstable-shared flag from configure that appears to not work any more (under NetBSD). Additionally, some distributions require the use of shared libraries for proper dependency tracking (e.g. Fedora), so it is better if we do the right versioning upstream. * Project hosting moved from an adhoc solution (custom web site and Monotone repository) to Google Code (standard wiki and Git). ATF now lives in a subcomponent of the Kyua project. Status: Vendor Tag: TNF Release Tags: atf-0-16 U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/Atffile U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Kyuafile U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/test-programs/meta_data_test.sh U src/external/bsd/atf/dist/test-programs/Atffile U src/external/bsd/atf/dist/test-programs/Kyuafile U src/external/bsd/atf/dist/test-programs/c_helpers.c U src/external/bsd/atf/dist/test-programs/srcdir_test.sh U src/external/bsd/atf/dist/test-programs/fork_test.sh U src/external/bsd/atf/dist/test-programs/config_test.sh U src/external/bsd/atf/dist/test-programs/common.sh U src/external/bsd/atf/dist/test-programs/cpp_helpers.cpp U src/external/bsd/atf/dist/test-programs/sh_helpers.sh U src/external/bsd/atf/dist/test-programs/result_test.sh U src/external/bsd/atf/dist/test-programs/expect_test.sh U src/external/bsd/atf/dist/atf-version/generate-revision.sh C src/external/bsd/atf/dist/atf-version/atf-version.cpp U src/external/bsd/atf/dist/atf-version/atf-version.1 U src/external/bsd/atf/dist/atf-run/atf-run.1 U src/external/bsd/atf/dist/atf-run/timer.hpp U src/external/bsd/atf/dist/atf-run/io.hpp U src/external/bsd/atf/dist/atf-run/atffile.hpp U src/external/bsd/atf/dist/atf-run/Atffile U src/external/bsd/atf/dist/atf-run/config_test.cpp U src/external/bsd/atf/dist/atf-run/Kyuafile U src/external/bsd/atf/dist/atf-run/signals.hpp U src/external/bsd/atf/dist/atf-run/user.hpp U src/external/bsd/atf/dist/atf-run/requirements_test.cpp U src/external/bsd/atf/dist/atf-run/test-program.hpp U src/external/bsd/atf/dist/atf-run/atffile_test.cpp U src/external/bsd/atf/dist/atf-run/config.cpp U src/external/bsd/atf/dist/atf-run/zero_tcs_helper.c U src/external/bsd/atf/dist/atf-run/signals_test.cpp U src/external/bsd/atf/dist/atf-run/pass_helper.cpp U src/external/bsd/atf/dist/atf-run/io.cpp U src/external/bsd/atf/dist/atf-run/io_test.cpp C src/external/bsd/atf/dist/atf-run/fs.cpp U src/external/bsd/atf/dist/atf-run/test-program.cpp U src/external/bsd/atf/dist/atf-run/bad_metadata_helper.c U src/external/bsd/atf/dist/atf-run/user_test.cpp U src/external/bsd/atf/dist/atf-run/signals.cpp U src/external/bsd/atf/dist/atf-run/integration_test.sh U src/external/bsd/atf/dist/atf-run/atffile.cpp U src/external/bsd/atf/dist/atf-run/atf-run.cpp U src/external/bsd/atf/dist/atf-run/fs.hpp C src/external/bsd/atf/dist/atf-run/test_program_test.cpp U src/external/bsd/atf/dist/atf-run/fs_test.cpp U src/external/bsd/atf/dist/atf-run/expect_helpers.c U src/external/bsd/atf/dist/atf-run/user.cpp U src/external/bsd/atf/dist/atf-run/timer.cpp U src/external/bsd/atf/dist/atf-run/requirements.hpp U src/external/bsd/atf/dist/atf-run/requirements.cpp U src/external/bsd/atf/dist/atf-run/misc_helpers.cpp U src/external/bsd/atf/dist/atf-run/several_tcs_helper.c U src/external/bsd/atf/dist/atf-run/config.hpp U src/external/bsd/atf/dist/atf-run/share/atf-run.hooks U src/external/bsd/atf/dist/atf-run/sample/atf-run.hooks U src/external/bsd/atf/dist/atf-run/sample/common.conf U src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh U
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Wed Jul 11 22:38:40 UTC 2012
Modified Files:
src/external/bsd/atf/dist/atf-c/detail: test_helpers.c
src/external/bsd/atf/dist/atf-run: test_program_test.cpp
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
src/external/bsd/atf/dist/atf-version: atf-version.cpp
Log Message:
Post-import merge of atf 0.16.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/atf/dist/atf-run/test_program_test.cpp
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/atf/dist/atf-version/atf-version.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
diff -u src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.3 src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.4
--- src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.3 Mon Jan 16 22:41:30 2012
+++ src/external/bsd/atf/dist/atf-c/detail/test_helpers.c Wed Jul 11 22:38:40 2012
@@ -46,33 +46,37 @@
static
void
-build_check_c_o_aux(const char *path, const char *failmsg)
+build_check_c_o_aux(const char *path, const char *failmsg,
+const bool expect_pass)
{
bool success;
atf_dynstr_t iflag;
-const char *optargs[2];
+const char *optargs[4];
RE(atf_dynstr_init_fmt(iflag, -I%s, atf_config_get(atf_includedir)));
optargs[0] = atf_dynstr_cstring(iflag);
-optargs[1] = NULL;
+optargs[1] = -Wall;
+optargs[2] = -Werror;
+optargs[3] = NULL;
RE(atf_check_build_c_o(path, test.o, optargs, success));
atf_dynstr_fini(iflag);
-if (!success)
+if ((expect_pass !success) || (!expect_pass success))
atf_tc_fail(%s, failmsg);
}
void
-build_check_c_o(const atf_tc_t *tc, const char *sfile, const char *failmsg)
+build_check_c_o(const atf_tc_t *tc, const char *sfile, const char *failmsg,
+const bool expect_pass)
{
atf_fs_path_t path;
RE(atf_fs_path_init_fmt(path, %s/%s,
atf_tc_get_config_var(tc, srcdir), sfile));
-build_check_c_o_aux(atf_fs_path_cstring(path), failmsg);
+build_check_c_o_aux(atf_fs_path_cstring(path), failmsg, expect_pass);
atf_fs_path_fini(path);
}
@@ -90,7 +94,7 @@ header_check(const char *hdrname)
snprintf(failmsg, sizeof(failmsg),
Header check failed; %s is not self-contained, hdrname);
-build_check_c_o_aux(test.c, failmsg);
+build_check_c_o_aux(test.c, failmsg, true);
}
void
Index: src/external/bsd/atf/dist/atf-run/test_program_test.cpp
diff -u src/external/bsd/atf/dist/atf-run/test_program_test.cpp:1.4 src/external/bsd/atf/dist/atf-run/test_program_test.cpp:1.5
--- src/external/bsd/atf/dist/atf-run/test_program_test.cpp:1.4 Mon Jan 16 22:41:30 2012
+++ src/external/bsd/atf/dist/atf-run/test_program_test.cpp Wed Jul 11 22:38:40 2012
@@ -1008,6 +1008,8 @@ ATF_INIT_TEST_CASES(tcs)
ATF_ADD_TEST_CASE(tcs, parse_test_case_result_skipped);
ATF_ADD_TEST_CASE(tcs, parse_test_case_result_unknown);
+ATF_ADD_TEST_CASE(tcs, read_test_case_result_failed);
+ATF_ADD_TEST_CASE(tcs, read_test_case_result_skipped);
ATF_ADD_TEST_CASE(tcs, read_test_case_result_no_file);
ATF_ADD_TEST_CASE(tcs, read_test_case_result_empty_file);
ATF_ADD_TEST_CASE(tcs, read_test_case_result_multiline);
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.6 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.7
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.6 Mon Jan 16 22:41:31 2012
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Wed Jul 11 22:38:40 2012
@@ -271,7 +271,7 @@ parse_status_check_arg(const std::string
else
value = parse_signal(value_str);
} else
-throw atf::application::usage_error(Invalid output checker);
+throw atf::application::usage_error(Invalid status checker);
return status_check(type, negated, value);
}
Index: src/external/bsd/atf/dist/atf-version/atf-version.cpp
diff -u src/external/bsd/atf/dist/atf-version/atf-version.cpp:1.6 src/external/bsd/atf/dist/atf-version/atf-version.cpp:1.7
--- src/external/bsd/atf/dist/atf-version/atf-version.cpp:1.6 Mon Jan 16 22:41:31 2012
+++ src/external/bsd/atf/dist/atf-version/atf-version.cpp Wed Jul 11 22:38:40 2012
@@ -69,7 +69,7 @@ atf_version::main(void)
#if defined(PACKAGE_REVISION_TYPE_DIST)
std::cout format_text(Built from a distribution file; no revision
information available.) \n;
-#elif defined(PACKAGE_REVISION_TYPE_MTN)
+#elif defined(PACKAGE_REVISION_TYPE_GIT)
std::cout format_text_with_tag(PACKAGE_REVISION_BRANCH, Branch: ,
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Wed Jul 11 22:40:16 UTC 2012
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Added Files:
src/external/bsd/atf/lib/libatf-c: shlib_version
src/external/bsd/atf/lib/libatf-c++: shlib_version
Log Message:
Update reachover Makefiles for atf 0.16.
As part of this change (and as done upstream and in various packaging
systems), start shipping shared libraries of both libatf-c and libatf-c++.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/libatf-c/shlib_version
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/libatf-c++/shlib_version
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.14 src/external/bsd/atf/lib/libatf-c/Makefile:1.15
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.14 Mon Jan 16 22:42:40 2012
+++ src/external/bsd/atf/lib/libatf-c/Makefile Wed Jul 11 22:40:16 2012
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/11 22:40:16 jmmv Exp $
NOLINT= # defined
.include bsd.own.mk
LIB= atf-c
-NOPIC= # defined; interface is still too unstable
CWARNFLAGS+= -Wno-missing-noreturn
@@ -90,7 +89,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.10 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.11
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.10 Mon Jan 16 22:42:40 2012
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Wed Jul 11 22:40:16 2012
@@ -96,19 +96,19 @@
#define PACKAGE_NAME Automated Testing Framework
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING Automated Testing Framework 0.15
+#define PACKAGE_STRING Automated Testing Framework 0.16
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME atf
/* Define to the home page for this package. */
-#define PACKAGE_URL http://www.NetBSD.org/~jmmv/atf/;
+#define PACKAGE_URL http://code.google.com/p/kyua/wiki/ATF;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 0.15
+#define PACKAGE_VERSION 0.16
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 0.15
+#define VERSION 0.16
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.12 src/external/bsd/atf/lib/libatf-c++/Makefile:1.13
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.12 Mon Jan 16 22:42:40 2012
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Wed Jul 11 22:40:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/01/16 22:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2012/07/11 22:40:16 jmmv Exp $
NOLINT= # defined
@@ -8,7 +8,6 @@ LIB= atf-c++
LIBISCXX= yes
LDADD= -L${.OBJDIR}/../libatf-c -latf-c
DPADD= ${LIBATF_C}
-NOPIC= # defined; interface is still too unstable
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
@@ -55,7 +54,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.16,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/Makefile:1.7 src/external/bsd/atf/tests/atf/atf-c/Makefile:1.8
--- src/external/bsd/atf/tests/atf/atf-c/Makefile:1.7 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile Wed Jul 11 22:40:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/11 22:40:16 jmmv Exp $
.include bsd.own.mk
@@ -16,6 +16,7 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/bs
FILESDIR= ${TESTSDIR}
CVS commit: src/external/bsd/atf/usr.bin
Module Name:src
Committed By: joerg
Date: Sat Jun 16 17:02:33 UTC 2012
Modified Files:
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
Log Message:
Don't bail out on unused private fields.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/usr.bin/atf-run/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/usr.bin/atf-report/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-report/Makefile:1.5 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.6
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.5 Sun Feb 20 20:18:57 2011
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Sat Jun 16 17:02:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/02/20 20:18:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/16 17:02:33 joerg Exp $
.include bsd.own.mk
@@ -18,4 +18,6 @@ CPPFLAGS+= -I${SRCDIR}
WARNS?= 2
+CWARNFLAGS.clang+= -Wno-error=unused-private-field
+
.include bsd.prog.mk
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.10 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.11
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.10 Thu Mar 31 16:45:45 2011
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sat Jun 16 17:02:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/03/31 16:45:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2012/06/16 17:02:33 joerg Exp $
.include bsd.own.mk
@@ -20,6 +20,8 @@ CPPFLAGS+= -I${.CURDIR}/../../lib/libatf
LDADD+= -latf-c++ -latf-c
DPADD+= ${LIBATF_CXX} ${LIBATF_C}
+CWARNFLAGS.clang+= -Wno-error=unused-private-field
+
COPTS.atf-run.cpp+= -Wno-stack-protector
WARNS?= 2
CVS commit: src/external/bsd/atf/dist/atf-run
Module Name:src
Committed By: jmmv
Date: Thu Apr 5 01:04:18 UTC 2012
Modified Files:
src/external/bsd/atf/dist/atf-run: fs.cpp
Log Message:
Fix retry logic to avoid triggering an assertion.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-run/fs.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/fs.cpp
diff -u src/external/bsd/atf/dist/atf-run/fs.cpp:1.3 src/external/bsd/atf/dist/atf-run/fs.cpp:1.4
--- src/external/bsd/atf/dist/atf-run/fs.cpp:1.3 Mon Jan 16 22:41:30 2012
+++ src/external/bsd/atf/dist/atf-run/fs.cpp Thu Apr 5 01:04:18 2012
@@ -137,9 +137,9 @@ retry_chmod:
subdirs = d.names();
ok = true;
} catch (const atf::system_error e) {
+retries--;
if (retries == 0)
throw e;
-retries--;
::sleep(retry_delay_in_seconds);
}
}
CVS commit: src/external/bsd/atf/dist/atf-report
Module Name:src
Committed By: jmmv
Date: Mon Jan 23 23:03:39 UTC 2012
Modified Files:
src/external/bsd/atf/dist/atf-report: tests-results.css
tests-results.xsl
Log Message:
Pull up upstream revision db8568696ad5a100ab3f118ac1cde53ee61ccbc3:
Fix some XSLT/CSS bugs that leaked some internal tags into the HTML file.
This, together with some CSS inconsistency, supposedly prevented the
timestamp column from being right-aligned... although I have not been able
to reproduce it with neither Chrome nor Firefox. That said, the changes
in here should fix this.
While doing this, also change the background color of the timestamp column
for test programs to improve the divider bar between test programs.
Based on patches and ideas from pgoyette@. Should fix PR bin/45859.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/atf/dist/atf-report/tests-results.css
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/atf/dist/atf-report/tests-results.xsl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-report/tests-results.css
diff -u src/external/bsd/atf/dist/atf-report/tests-results.css:1.4 src/external/bsd/atf/dist/atf-report/tests-results.css:1.5
--- src/external/bsd/atf/dist/atf-report/tests-results.css:1.4 Mon Jan 16 22:41:30 2012
+++ src/external/bsd/atf/dist/atf-report/tests-results.css Mon Jan 23 23:03:39 2012
@@ -148,10 +148,22 @@ table.tcs-summary th {
}
table.tcs-summary td.numeric {
+width: 1pt;
+}
+
+table.tcs-summary td.numeric p {
text-align: right;
+}
+
+table.tcs-summary td.tp-numeric {
+background: #dd;
width: 1pt;
}
+table.tcs-summary td.tp-numeric p {
+text-align: right;
+}
+
table.tcs-summary td.tp-id {
background: #dd;
font-weight: bold;
Index: src/external/bsd/atf/dist/atf-report/tests-results.xsl
diff -u src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.6 src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.7
--- src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.6 Mon Jan 16 22:41:30 2012
+++ src/external/bsd/atf/dist/atf-report/tests-results.xsl Mon Jan 23 23:03:39 2012
@@ -382,8 +382,8 @@
td class=tp-id colspan=3
pxsl:value-of select=@id //p
/td
-td class=numeric
- xsl:apply-templates select=tp-time /s
+td class=tp-numeric
+ pxsl:value-of select=tp-time /s/p
/td
/tr
xsl:if test=$which != 'bogus'
@@ -437,9 +437,9 @@
expected_failure|expected_timeout|
expected_signal|failed|passed|
skipped mode=tc /
- td class=numeric
- xsl:apply-templates select=tc-time /s
- /td
+td class=numeric
+ pxsl:value-of select=tc-time /s/p
+/td
/tr
/xsl:if
/xsl:template
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Mon Jan 16 22:37:01 UTC 2012 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22655 Log Message: Import atf 0.15: the major goal of this import is to reconcile any local changes to the atf codebase with upstream code. All local changes should have been backported, with appropriate portability workarounds where necessary. This new release also includes other changes though, such as performance improvements and bug fixes, and also a major new feature partially implemented by pgoyette@: the time to execute each test cases and test program is now recorded and included in the output reports. The import into NetBSD has been tested natively on amd64 and macppc, and the full test suite has also been run through anita on amd64 and i386. No regressions observed... but you never know. From the NEWS file, the changes in this version are as follows: Experimental version released on January 16th, 2012. * Respect stdin in atf-check. The previous release silenced stdin for any processes spawned by atf, not only test programs, which caused breakage in tests that pipe data through atf-check. * Performance improvements to atf-sh. * Enabled detection of unused parameters and variables in the code and fixed all warnings. * Changed the behavior of developer mode. Compiler warnings are now enabled unconditionally regardless of whether we are in developer mode or not; developer mode is now only used to perform strict warning checks and to enable assertions. Additionally, developer mode is now only automatically enabled when building from the repository, not for formal releases. * Added new Autoconf M4 macros (ATF_ARG_WITH, ATF_CHECK_C and ATF_CHECK_CXX) to provide a consistent way of defining a --with-arg flag in configure scripts and detecting the presence of any of the ATF bindings. Note that ATF_CHECK_SH was already introduced in 0.14, but it has now been modified to also honor --with-atf if instantiated. * Added timing support to atf-run / atf-report. * Added support for a 'require.memory' property, to specify the minimum amount of physical memory needed by the test case to yield valid results. * PR bin/45690: Force an ISO-8859-1 encoding in the XML files generated by atf-report so that invalid data in the output of test cases does not mangle our report. Status: Vendor Tag: TNF Release Tags: atf-0-15 U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Atffile U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/Kyuafile U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/macros.h C src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/utils.h U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh C src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c U src/external/bsd/atf/dist/atf-c/error.c C src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tp.c U src/external/bsd/atf/dist/atf-c/utils.c U src/external/bsd/atf/dist/atf-c/h_build.h U src/external/bsd/atf/dist/atf-c/atf_c_test.c U src/external/bsd/atf/dist/atf-c/build_test.c U src/external/bsd/atf/dist/atf-c/check_test.c U src/external/bsd/atf/dist/atf-c/config_test.c U src/external/bsd/atf/dist/atf-c/tc_test.c U src/external/bsd/atf/dist/atf-c/error_test.c U src/external/bsd/atf/dist/atf-c/macros_test.c U src/external/bsd/atf/dist/atf-c/tp_test.c U src/external/bsd/atf/dist/atf-c/utils_test.c U src/external/bsd/atf/dist/atf-c/atf-c.pc.in U src/external/bsd/atf/dist/atf-c/Atffile U src/external/bsd/atf/dist/atf-c/Kyuafile U src/external/bsd/atf/dist/atf-c/macros_h_test.c U src/external/bsd/atf/dist/atf-c/detail/process_helpers.c C src/external/bsd/atf/dist/atf-c/detail/test_helpers.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers.h U src/external/bsd/atf/dist/atf-c/detail/dynstr.c U src/external/bsd/atf/dist/atf-c/detail/dynstr.h U src/external/bsd/atf/dist/atf-c/detail/env.c U src/external/bsd/atf/dist/atf-c/detail/env.h U src/external/bsd/atf/dist/atf-c/detail/fs.c U src/external/bsd/atf/dist/atf-c/detail/fs.h U src/external/bsd/atf/dist/atf-c/detail/list.c U src/external/bsd/atf/dist/atf-c/detail/list.h U src/external/bsd/atf/dist/atf-c/detail/map.c U src/external/bsd/atf/dist/atf-c/detail/map.h C src/external/bsd/atf/dist/atf-c/detail/process.c C src/external/bsd/atf/dist/atf-c/detail/process.h U
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Mon Jan 16 22:42:40 UTC 2012
Modified Files:
src/external/bsd/atf: prepare-import.sh
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Log Message:
Update reachover build files and scripts to deal with the just-imported
atf 0.15.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/prepare-import.sh
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/prepare-import.sh
diff -u src/external/bsd/atf/prepare-import.sh:1.5 src/external/bsd/atf/prepare-import.sh:1.6
--- src/external/bsd/atf/prepare-import.sh:1.5 Tue Jun 14 15:27:11 2011
+++ src/external/bsd/atf/prepare-import.sh Mon Jan 16 22:42:40 2012
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.5 2011/06/14 15:27:11 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.6 2012/01/16 22:42:40 jmmv Exp $
#
# Use this script to recreate the 'dist' subdirectory from a newly released
# distfile. The script takes care of unpacking the distfile, removing any
@@ -16,7 +16,7 @@ CLEAN_PATTERNS=${CLEAN_PATTERNS} *.m4
CLEAN_PATTERNS=${CLEAN_PATTERNS} INSTALL TODO
CLEAN_PATTERNS=${CLEAN_PATTERNS} Makefile* */Makefile* */*/Makefile*
CLEAN_PATTERNS=${CLEAN_PATTERNS} admin
-CLEAN_PATTERNS=${CLEAN_PATTERNS} atf-sh/atf-sh.m4
+CLEAN_PATTERNS=${CLEAN_PATTERNS} atf-*/atf-*.m4
CLEAN_PATTERNS=${CLEAN_PATTERNS} bconfig.h.in
CLEAN_PATTERNS=${CLEAN_PATTERNS} bootstrap
CLEAN_PATTERNS=${CLEAN_PATTERNS} configure*
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.13 src/external/bsd/atf/lib/libatf-c/Makefile:1.14
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.13 Fri Sep 16 16:41:20 2011
+++ src/external/bsd/atf/lib/libatf-c/Makefile Mon Jan 16 22:42:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/09/16 16:41:20 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/01/16 22:42:40 jmmv Exp $
NOLINT= # defined
@@ -80,6 +80,7 @@ defs.h: defs.h.in
${TOOL_SED} \
-e 's|@ATTRIBUTE_FORMAT_PRINTF@|__attribute__((__format__(__printf__, a, b)))|g' \
-e 's|@ATTRIBUTE_NORETURN@|__attribute__((__noreturn__))|g' \
+ -e 's|@ATTRIBUTE_UNUSED@|__attribute__((__unused__))|g' \
${.ALLSRC} ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
@@ -89,7 +90,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.9 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.10
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.9 Tue Jun 14 15:27:11 2011
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Mon Jan 16 22:42:40 2012
@@ -90,13 +90,13 @@
#define PACKAGE_BUGREPORT atf-de...@netbsd.org
/* Define to the copyright string applicable to this package. */
-#define PACKAGE_COPYRIGHT Copyright (c) 2007-2011 The NetBSD Foundation, Inc.
+#define PACKAGE_COPYRIGHT Copyright (c) 2007-2012 The NetBSD Foundation, Inc.
/* Define to the full name of this package. */
#define PACKAGE_NAME Automated Testing Framework
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING Automated Testing Framework 0.14
+#define PACKAGE_STRING Automated Testing Framework 0.15
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME atf
@@ -105,10 +105,10 @@
#define PACKAGE_URL http://www.NetBSD.org/~jmmv/atf/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 0.14
+#define PACKAGE_VERSION 0.15
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 0.14
+#define VERSION 0.15
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.11 src/external/bsd/atf/lib/libatf-c++/Makefile:1.12
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.11 Tue Jun 14 15:27:11 2011
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Mon Jan 16 22:42:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/06/14 15:27:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2012/01/16 22:42:40 jmmv Exp $
NOLINT= # defined
@@ -55,7 +55,7 @@ FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e
CVS commit: src/external/bsd/atf/dist/atf-run
Module Name:src
Committed By: christos
Date: Mon Dec 19 21:59:46 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-run: timer.cpp
Log Message:
Put back setitimer based code for the have-nots: (OS/X Lion)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-run/timer.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/timer.cpp
diff -u src/external/bsd/atf/dist/atf-run/timer.cpp:1.3 src/external/bsd/atf/dist/atf-run/timer.cpp:1.4
--- src/external/bsd/atf/dist/atf-run/timer.cpp:1.3 Sun Dec 18 22:16:05 2011
+++ src/external/bsd/atf/dist/atf-run/timer.cpp Mon Dec 19 16:59:46 2011
@@ -44,11 +44,25 @@ namespace impl = atf::atf_run;
// Auxiliary functions.
//
+#ifdef SIGEV_NONE
+#define HAVE_POSIX_TIMER
+#endif
+
+#ifndef HAVE_POSIX_TIMER
+static void *handle;
+#endif
+
static
void
handler(int signo, siginfo_t *si, void *uc)
{
-impl::timer *timer = static_castimpl::timer *(si-si_value.sival_ptr);
+impl::timer *timer = static_castimpl::timer *(
+#ifndef HAVE_POSIX_TIMER
+ handle
+#else
+ si-si_value.sival_ptr
+#endif
+);
timer-setfired();
timer-timeout_callback();
@@ -68,7 +82,7 @@ impl::timer::timer(const unsigned int se
throw system_error(IMPL_NAME ::timer::timer,
Failed to set signal handler, errno);
-
+#ifndef HAVE_POSIX_TIMER
::sigevent se;
se.sigev_notify = SIGEV_SIGNAL;
se.sigev_signo = SIGALRM;
@@ -92,11 +106,32 @@ impl::timer::timer(const unsigned int se
throw system_error(IMPL_NAME ::timer::timer,
Failed to program timer, errno);
}
+#else
+::itimerval it, oit;
+it.it_interval.tv_sec = 0;
+it.it_interval.tv_usec = 0;
+it.it_value.tv_sec = seconds;
+it.it_value.tv_usec = 0;
+if (::setitimer(ITIMER_REAL, it, oit) == -1)
+ ::sigaction(SIGALRM, m_old_sa, NULL);
+throw system_error(IMPL_NAME ::timer::timer,
+ Failed to program timer, errno);
+}
+TIMEVAL_TO_TIMESPEC(m_old_it, oit);
+handle = static_castvoid *(this);
+#endif
}
impl::timer::~timer(void)
{
-int ret = ::timer_delete(m_timer);
+int ret;
+#ifdef HAVE_POSIX_TIMER
+::itimerval oit;
+TIMESPEC_TO_TIMEVAL(oit, m_old_it);
+ret = ::setitimer(ITIMER_REAL, oit, NULL);
+#else
+ret = ::timer_delete(m_timer);
+#endif
INV(ret != -1);
ret = ::sigaction(SIGALRM, m_old_sa, NULL);
INV(ret != -1);
CVS commit: src/external/bsd/atf/dist/atf-run
Module Name:src
Committed By: christos
Date: Mon Dec 19 22:25:46 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-run: timer.cpp
Log Message:
- make all the ifdefs match
- make it compile, and test
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-run/timer.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/timer.cpp
diff -u src/external/bsd/atf/dist/atf-run/timer.cpp:1.4 src/external/bsd/atf/dist/atf-run/timer.cpp:1.5
--- src/external/bsd/atf/dist/atf-run/timer.cpp:1.4 Mon Dec 19 16:59:46 2011
+++ src/external/bsd/atf/dist/atf-run/timer.cpp Mon Dec 19 17:25:45 2011
@@ -57,10 +57,10 @@ void
handler(int signo, siginfo_t *si, void *uc)
{
impl::timer *timer = static_castimpl::timer *(
-#ifndef HAVE_POSIX_TIMER
- handle
-#else
+#ifdef HAVE_POSIX_TIMER
si-si_value.sival_ptr
+#else
+ handle
#endif
);
@@ -82,7 +82,7 @@ impl::timer::timer(const unsigned int se
throw system_error(IMPL_NAME ::timer::timer,
Failed to set signal handler, errno);
-#ifndef HAVE_POSIX_TIMER
+#ifdef HAVE_POSIX_TIMER
::sigevent se;
se.sigev_notify = SIGEV_SIGNAL;
se.sigev_signo = SIGALRM;
@@ -112,12 +112,13 @@ impl::timer::timer(const unsigned int se
it.it_interval.tv_usec = 0;
it.it_value.tv_sec = seconds;
it.it_value.tv_usec = 0;
-if (::setitimer(ITIMER_REAL, it, oit) == -1)
+if (::setitimer(ITIMER_REAL, it, oit) == -1) {
::sigaction(SIGALRM, m_old_sa, NULL);
throw system_error(IMPL_NAME ::timer::timer,
Failed to program timer, errno);
}
-TIMEVAL_TO_TIMESPEC(m_old_it, oit);
+TIMEVAL_TO_TIMESPEC(oit.it_interval, m_old_it.it_interval);
+TIMEVAL_TO_TIMESPEC(oit.it_value, m_old_it.it_value);
handle = static_castvoid *(this);
#endif
}
@@ -126,11 +127,12 @@ impl::timer::~timer(void)
{
int ret;
#ifdef HAVE_POSIX_TIMER
+ret = ::timer_delete(m_timer);
+#else
::itimerval oit;
-TIMESPEC_TO_TIMEVAL(oit, m_old_it);
+TIMESPEC_TO_TIMEVAL(oit.it_interval, m_old_it.it_interval);
+TIMESPEC_TO_TIMEVAL(oit.it_value, m_old_it.it_value);
ret = ::setitimer(ITIMER_REAL, oit, NULL);
-#else
-ret = ::timer_delete(m_timer);
#endif
INV(ret != -1);
ret = ::sigaction(SIGALRM, m_old_sa, NULL);
CVS commit: src/external/bsd/atf/dist/atf-run
Module Name:src
Committed By: christos
Date: Sun Dec 18 22:34:06 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-run: timer.cpp timer.hpp
Log Message:
Don't use antiquated BSD API's that require global variable, use posix timers
instead.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-run/timer.cpp \
src/external/bsd/atf/dist/atf-run/timer.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/timer.cpp
diff -u src/external/bsd/atf/dist/atf-run/timer.cpp:1.1.1.2 src/external/bsd/atf/dist/atf-run/timer.cpp:1.2
--- src/external/bsd/atf/dist/atf-run/timer.cpp:1.1.1.2 Wed Oct 20 05:14:23 2010
+++ src/external/bsd/atf/dist/atf-run/timer.cpp Sun Dec 18 17:34:06 2011
@@ -27,9 +27,7 @@
// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
-extern C {
-#include signal.h
-}
+#include csignal
#include cerrno
@@ -46,56 +44,69 @@ namespace impl = atf::atf_run;
// Auxiliary functions.
//
-namespace sigalrm {
-
-bool m_fired = false;
-impl::timer* m_timer = NULL;
-
+static
void
-handler(const int signo)
+handler(int signo, siginfo_t *si, void *uc)
{
-PRE(signo == SIGALRM);
+impl::timer *timer = static_castimpl::timer *(si-si_value.sival_ptr);
-m_fired = true;
-m_timer-timeout_callback();
+timer-setfired();
+timer-timeout_callback();
}
-} // anonymous namespace
-
//
// The timer class.
//
-impl::timer::timer(const unsigned int seconds)
+impl::timer::timer(const unsigned int seconds) : m_fired(false)
{
-sigalrm::m_fired = false;
-sigalrm::m_timer = this;
-m_sigalrm.reset(new signal_programmer(SIGALRM, sigalrm::handler));
-
-::itimerval timeval;
-timeval.it_interval.tv_sec = 0;
-timeval.it_interval.tv_usec = 0;
-timeval.it_value.tv_sec = seconds;
-timeval.it_value.tv_usec = 0;
+struct sigaction sa;
+::sigemptyset(sa.sa_mask);
+sa.sa_flags = SA_SIGINFO;
+sa.sa_sigaction = ::handler;
+if (::sigaction(SIGALRM, sa, m_old_sa) == -1)
+throw system_error(IMPL_NAME ::timer::timer,
+ Failed to set signal handler, errno);
+
+
+::sigevent se;
+se.sigev_notify = SIGEV_SIGNAL;
+se.sigev_signo = SIGALRM;
+se.sigev_value.sival_ptr = static_castvoid *(this);
+se.sigev_notify_function = NULL;
+se.sigev_notify_attributes = NULL;
+if (::timer_create(CLOCK_MONOTONIC, se, m_timer) == -1) {
+ ::sigaction(SIGALRM, m_old_sa, NULL);
+throw system_error(IMPL_NAME ::timer::timer,
+ Failed to create timer, errno);
+}
-if (::setitimer(ITIMER_REAL, timeval, m_old_timeval) == -1)
+::itimerspec it;
+it.it_interval.tv_sec = 0;
+it.it_interval.tv_nsec = 0;
+it.it_value.tv_sec = seconds;
+it.it_value.tv_nsec = 0;
+if (::timer_settime(m_timer, 0, it, m_old_it) == -1) {
+ ::sigaction(SIGALRM, m_old_sa, NULL);
+ ::timer_delete(m_timer);
throw system_error(IMPL_NAME ::timer::timer,
Failed to program timer, errno);
+}
}
impl::timer::~timer(void)
{
-const int ret = ::setitimer(ITIMER_REAL, m_old_timeval, NULL);
+int ret = ::timer_delete(m_timer);
+INV(ret != -1);
+ret = ::sigaction(SIGALRM, m_old_sa, NULL);
INV(ret != -1);
-sigalrm::m_timer = NULL;
-sigalrm::m_fired = false;
}
bool
impl::timer::fired(void)
const
{
-return sigalrm::m_fired;
+return m_fired;
}
//
@@ -121,5 +132,5 @@ impl::child_timer::timeout_callback(void
// Should use killpg(2) but, according to signal(7), using this system
// call in a signal handler context is not safe.
-::kill(m_pid, SIGKILL);
+::killpg(-m_pid, SIGKILL);
}
Index: src/external/bsd/atf/dist/atf-run/timer.hpp
diff -u src/external/bsd/atf/dist/atf-run/timer.hpp:1.1.1.2 src/external/bsd/atf/dist/atf-run/timer.hpp:1.2
--- src/external/bsd/atf/dist/atf-run/timer.hpp:1.1.1.2 Wed Oct 20 05:14:23 2010
+++ src/external/bsd/atf/dist/atf-run/timer.hpp Sun Dec 18 17:34:06 2011
@@ -30,12 +30,8 @@
#if !defined(_ATF_RUN_ALARM_HPP_)
#define _ATF_RUN_ALARM_HPP_
-extern C {
-#include sys/time.h
-#include sys/types.h
-}
-
-#include memory
+#include ctime
+#include csignal
#include atf-c++/utils.hpp
@@ -49,14 +45,17 @@ class signal_programmer;
//
class timer : utils::noncopyable {
-::itimerval m_old_timeval;
-std::auto_ptr signal_programmer m_sigalrm;
+::timer_t m_timer;
+::itimerspec m_old_it;
+struct sigaction
CVS commit: src/external/bsd/atf/dist/atf-run
Module Name:src
Committed By: christos
Date: Mon Dec 19 03:16:06 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-run: timer.cpp
Log Message:
fix killing code I just broke, and give program a chance to cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-run/timer.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/timer.cpp
diff -u src/external/bsd/atf/dist/atf-run/timer.cpp:1.2 src/external/bsd/atf/dist/atf-run/timer.cpp:1.3
--- src/external/bsd/atf/dist/atf-run/timer.cpp:1.2 Sun Dec 18 17:34:06 2011
+++ src/external/bsd/atf/dist/atf-run/timer.cpp Sun Dec 18 22:16:05 2011
@@ -128,9 +128,10 @@ impl::child_timer::~child_timer(void)
void
impl::child_timer::timeout_callback(void)
{
+static const timespec ts = { 1, 0 };
m_terminate = true;
-
-// Should use killpg(2) but, according to signal(7), using this system
-// call in a signal handler context is not safe.
-::killpg(-m_pid, SIGKILL);
+::kill(-m_pid, SIGTERM);
+::nanosleep(ts, NULL);
+if (::kill(-m_pid, 0) != -1)
+ ::kill(-m_pid, SIGKILL);
}
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: christos
Date: Wed Nov 16 17:46:16 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-c++/detail: text.cpp text.hpp
src/external/bsd/atf/dist/atf-run: requirements.cpp test-program.cpp
Log Message:
PR/45619: jmmv: Allow atf tests to request a minimum amount of memory
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/atf/dist/atf-c++/detail/text.cpp \
src/external/bsd/atf/dist/atf-c++/detail/text.hpp
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/atf/dist/atf-run/requirements.cpp
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/dist/atf-run/test-program.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c++/detail/text.cpp
diff -u src/external/bsd/atf/dist/atf-c++/detail/text.cpp:1.1.1.1 src/external/bsd/atf/dist/atf-c++/detail/text.cpp:1.2
--- src/external/bsd/atf/dist/atf-c++/detail/text.cpp:1.1.1.1 Wed Oct 20 05:14:21 2010
+++ src/external/bsd/atf/dist/atf-c++/detail/text.cpp Wed Nov 16 12:46:16 2011
@@ -33,6 +33,7 @@ extern C {
#include cctype
#include cstring
+#include cstdlib
extern C {
#include ../../atf-c/error.h
@@ -133,3 +134,12 @@ impl::to_bool(const std::string str)
return b;
}
+
+int64_t
+impl::to_number(const std::string str)
+{
+ int64_t num;
+ ::dehumanize_number(str.c_str(), num);
+ return num;
+}
+
Index: src/external/bsd/atf/dist/atf-c++/detail/text.hpp
diff -u src/external/bsd/atf/dist/atf-c++/detail/text.hpp:1.1.1.1 src/external/bsd/atf/dist/atf-c++/detail/text.hpp:1.2
--- src/external/bsd/atf/dist/atf-c++/detail/text.hpp:1.1.1.1 Wed Oct 20 05:14:21 2010
+++ src/external/bsd/atf/dist/atf-c++/detail/text.hpp Wed Nov 16 12:46:16 2011
@@ -106,6 +106,13 @@ bool to_bool(const std::string);
std::string to_lower(const std::string);
//!
+//! \brief Converts the given string to a number
+//!
+//! The string should be of the form ^[0-9]+[KMGT]$ or ^[0-9]$
+//!
+int64_t to_number(const std::string);
+
+//!
//! \brief Converts the given object to a string.
//!
//! Returns a string with the representation of the given object. There
Index: src/external/bsd/atf/dist/atf-run/requirements.cpp
diff -u src/external/bsd/atf/dist/atf-run/requirements.cpp:1.1.1.4 src/external/bsd/atf/dist/atf-run/requirements.cpp:1.2
--- src/external/bsd/atf/dist/atf-run/requirements.cpp:1.1.1.4 Tue Jun 14 11:23:24 2011
+++ src/external/bsd/atf/dist/atf-run/requirements.cpp Wed Nov 16 12:46:16 2011
@@ -29,6 +29,14 @@
// TODO: We probably don't want to raise std::runtime_error for the errors
// detected in this file.
+extern C {
+#include sys/param.h
+#include sys/sysctl.h
+};
+
+#include cstdlib
+#include cstring
+#include cerrno
#include stdexcept
#include atf-c++/config.hpp
@@ -185,6 +193,36 @@ check_user(const std::string user, cons
require.user);
}
+static
+std::string
+check_memory(const std::string memory)
+{
+// Make sure we have enough memory
+int64_t memneed = atf::text::to_number(memory);
+int64_t memavail;
+size_t len = sizeof(memavail);
+
+if (::sysctlbyname(hw.usermem64, memavail, len, NULL, 0) == -1) {
+ const char *e = ::strerror(errno);
+ std::stringstream ss;
+ ss sysctl hw.usermem64 failed ( e );
+ return ss.str();
+}
+
+if (memavail memneed) {
+ char avail[6], need[6];
+ ::humanize_number(avail, sizeof(avail), memavail, , HN_AUTOSCALE,
+ HN_B | HN_NOSPACE);
+ ::humanize_number(need, sizeof(need), memneed, , HN_AUTOSCALE,
+ HN_B | HN_NOSPACE);
+ std::stringstream ss;
+ ss available memory ( avail
+ ) is less than required ( need );
+ return ss.str();
+}
+return ;
+}
+
} // anonymous namespace
std::string
@@ -211,6 +249,8 @@ impl::check_requirements(const atf::test
failure_reason = check_progs(value);
else if (name == require.user)
failure_reason = check_user(value, config);
+ else if (name == require.memory)
+failure_reason = check_memory(value);
else {
// Unknown require.* properties are forbidden by the
// application/X-atf-tp parser.
Index: src/external/bsd/atf/dist/atf-run/test-program.cpp
diff -u src/external/bsd/atf/dist/atf-run/test-program.cpp:1.10 src/external/bsd/atf/dist/atf-run/test-program.cpp:1.11
--- src/external/bsd/atf/dist/atf-run/test-program.cpp:1.10 Wed Jun 15 04:48:36 2011
+++ src/external/bsd/atf/dist/atf-run/test-program.cpp Wed Nov 16 12:46:16 2011
@@ -418,6 +418,7 @@ detail::atf_tp_reader::validate_and_inse
const std::string ident_regex = ^[_A-Za-z0-9]+$;
const std::string integer_regex = ^[0-9]+$;
+const std::string memory_regex = ^[0-9]+[KMGT]$;
if (name == descr) {
// Any non-empty value is valid.
@@ -438,6 +439,12 @@ detail::atf_tp_reader::validate_and_inse
} else if (name == require.machine) {
CVS commit: src/external/bsd/atf/dist/atf-c
Module Name:src Committed By: christos Date: Wed Nov 9 14:42:43 UTC 2011 Modified Files: src/external/bsd/atf/dist/atf-c: tc.c Log Message: need || instead of To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/dist/atf-c/tc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/tc.c diff -u src/external/bsd/atf/dist/atf-c/tc.c:1.10 src/external/bsd/atf/dist/atf-c/tc.c:1.11 --- src/external/bsd/atf/dist/atf-c/tc.c:1.10 Tue Nov 8 15:25:14 2011 +++ src/external/bsd/atf/dist/atf-c/tc.c Wed Nov 9 09:42:42 2011 @@ -164,7 +164,7 @@ write_resfile(const int fd, const char * ssize_t ret; int count = 0; -INV(arg == -1 reason != NULL); +INV(arg == -1 || reason != NULL); iov[count].iov_base = __UNCONST(result); iov[count++].iov_len = strlen(result);
CVS commit: src/external/bsd/atf/dist/atf-c
Module Name:src
Committed By: christos
Date: Tue Nov 8 20:25:14 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-c: tc.c
Log Message:
use writev(2) instead of dprintf(3) for portability. Suggested by joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/dist/atf-c/tc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/tc.c
diff -u src/external/bsd/atf/dist/atf-c/tc.c:1.9 src/external/bsd/atf/dist/atf-c/tc.c:1.10
--- src/external/bsd/atf/dist/atf-c/tc.c:1.9 Sun Nov 6 13:18:16 2011
+++ src/external/bsd/atf/dist/atf-c/tc.c Tue Nov 8 15:25:14 2011
@@ -29,6 +29,7 @@
#include sys/types.h
#include sys/stat.h
+#include sys/uio.h
#include errno.h
#include fcntl.h
@@ -156,24 +157,40 @@ static atf_error_t
write_resfile(const int fd, const char *result, const int arg,
const atf_dynstr_t *reason)
{
-if (arg == -1 reason == NULL) {
-if (dprintf(fd, %s\n, result) = 0)
-goto err;
-} else if (arg == -1 reason != NULL) {
-if (dprintf(fd, %s: %s\n, result,
- atf_dynstr_cstring(reason)) 0)
-goto err;
-} else if (arg != -1 reason != NULL) {
-if (dprintf(fd, %s(%d): %s\n, result,
- arg, atf_dynstr_cstring(reason)) 0)
-goto err;
-} else {
-UNREACHABLE;
+static char NL[] = \n, CS[] = : ;
+char buf[64];
+const char *r;
+struct iovec iov[5];
+ssize_t ret;
+int count = 0;
+
+INV(arg == -1 reason != NULL);
+
+iov[count].iov_base = __UNCONST(result);
+iov[count++].iov_len = strlen(result);
+
+if (reason != NULL) {
+ if (arg != -1) {
+ iov[count].iov_base = buf;
+ iov[count++].iov_len = snprintf(buf, sizeof(buf), (%d), arg);
+ }
+
+ iov[count].iov_base = CS;
+ iov[count++].iov_len = sizeof(CS) - 1;
+
+ r = atf_dynstr_cstring(reason);
+ iov[count].iov_base = __UNCONST(r);
+ iov[count++].iov_len = strlen(r);
}
-return atf_no_error();
+iov[count].iov_base = NL;
+iov[count++].iov_len = sizeof(NL) - 1;
+
+while ((ret = writev(fd, iov, count)) == -1 errno == EINTR)
+continue; /* Retry. */
+if (ret != -1)
+return atf_no_error();
-err:
return atf_libc_error(
errno, Failed to write results file; result %s, reason %s, result,
reason == NULL ? null : atf_dynstr_cstring(reason));
CVS commit: src/external/bsd/atf/dist/atf-c
Module Name:src
Committed By: christos
Date: Sun Nov 6 18:18:16 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-c: tc.c
Log Message:
don't truncate error messages to 1K.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/dist/atf-c/tc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/tc.c
diff -u src/external/bsd/atf/dist/atf-c/tc.c:1.8 src/external/bsd/atf/dist/atf-c/tc.c:1.9
--- src/external/bsd/atf/dist/atf-c/tc.c:1.8 Sun Nov 7 12:45:21 2010
+++ src/external/bsd/atf/dist/atf-c/tc.c Sun Nov 6 13:18:16 2011
@@ -156,28 +156,22 @@ static atf_error_t
write_resfile(const int fd, const char *result, const int arg,
const atf_dynstr_t *reason)
{
-char buffer[1024];
-int ret;
-
if (arg == -1 reason == NULL) {
-if (snprintf(buffer, sizeof(buffer), %s\n, result) = 0)
+if (dprintf(fd, %s\n, result) = 0)
goto err;
} else if (arg == -1 reason != NULL) {
-if (snprintf(buffer, sizeof(buffer), %s: %s\n, result,
- atf_dynstr_cstring(reason)) = 0)
+if (dprintf(fd, %s: %s\n, result,
+ atf_dynstr_cstring(reason)) 0)
goto err;
} else if (arg != -1 reason != NULL) {
-if (snprintf(buffer, sizeof(buffer), %s(%d): %s\n, result,
- arg, atf_dynstr_cstring(reason)) = 0)
+if (dprintf(fd, %s(%d): %s\n, result,
+ arg, atf_dynstr_cstring(reason)) 0)
goto err;
} else {
UNREACHABLE;
}
-while ((ret = write(fd, buffer, strlen(buffer))) == -1 errno == EINTR)
-; /* Retry. */
-if (ret != -1)
-return atf_no_error();
+return atf_no_error();
err:
return atf_libc_error(
CVS commit: src/external/bsd/atf/tests/atf/atf-c/detail
Module Name:src Committed By: tron Date: Mon Jul 18 19:30:49 UTC 2011 Modified Files: src/external/bsd/atf/tests/atf/atf-c/detail: Makefile Log Message: Turn SSP warnings for dynstr_test.c off, found GCC 4.5. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/tests/atf/atf-c/detail/Makefile diff -u src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.1 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.2 --- src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.1 Wed Oct 20 09:20:11 2010 +++ src/external/bsd/atf/tests/atf/atf-c/detail/Makefile Mon Jul 18 19:30:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:11 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2011/07/18 19:30:49 tron Exp $ .include bsd.own.mk @@ -32,4 +32,10 @@ .endfor .undef test +# Don't warn about functions which cannot be stack smash protected as +# there are a lot of them. +.if defined(HAVE_GCC) || defined(HAVE_PCC) +COPTS.dynstr_test.c= -Wno-stack-protector +.endif + .include bsd.test.mk
CVS commit: src/external/bsd/atf/dist/atf-c/detail
Module Name:src Committed By: joerg Date: Thu Jun 16 14:57:22 UTC 2011 Modified Files: src/external/bsd/atf/dist/atf-c/detail: test_helpers.c Log Message: Properly use a format string. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/atf/dist/atf-c/detail/test_helpers.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/detail/test_helpers.c diff -u src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.1.1.1 src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.2 --- src/external/bsd/atf/dist/atf-c/detail/test_helpers.c:1.1.1.1 Wed Oct 20 09:14:19 2010 +++ src/external/bsd/atf/dist/atf-c/detail/test_helpers.c Thu Jun 16 14:57:22 2011 @@ -62,7 +62,7 @@ atf_dynstr_fini(iflag); if (!success) -atf_tc_fail(failmsg); +atf_tc_fail(%s, failmsg); } void
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Wed Jun 15 08:48:36 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-c/detail: process.c
src/external/bsd/atf/dist/atf-run: test-program.cpp
src/external/bsd/atf/dist/atf-sh: atf-check_test.sh
Log Message:
Pull up part of revision f621bc0489ac3e4ef364f840a852a6a5290e8e12:
-
Only silence stdin for test programs
atf-check is expected to accept data in its stdin, and a previous change
broke this behavior.
-
This should fix a few tests that broke during the 0.14 import. In
particularly, the tests in libc/stdlib and libc/ssp that redirect stuff
to atf_check.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c/detail/process.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/dist/atf-run/test-program.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/detail/process.c
diff -u src/external/bsd/atf/dist/atf-c/detail/process.c:1.3 src/external/bsd/atf/dist/atf-c/detail/process.c:1.4
--- src/external/bsd/atf/dist/atf-c/detail/process.c:1.3 Tue Jun 14 15:26:20 2011
+++ src/external/bsd/atf/dist/atf-c/detail/process.c Wed Jun 15 08:48:35 2011
@@ -412,24 +412,6 @@
}
static
-atf_error_t
-silence_stdin(void)
-{
-atf_error_t err;
-
-close(STDIN_FILENO);
-int fd = open(/dev/zero, O_RDONLY);
-if (fd == -1)
-err = atf_libc_error(errno, Could not open /dev/zero);
-else {
-INV(fd == STDIN_FILENO);
-err = atf_no_error();
-}
-
-return err;
-}
-
-static
void
do_child(void (*)(void *),
void *,
@@ -445,10 +427,6 @@
{
atf_error_t err;
-err = silence_stdin();
-if (atf_is_error(err))
-goto out;
-
err = child_connect(outsp, STDOUT_FILENO);
if (atf_is_error(err))
goto out;
Index: src/external/bsd/atf/dist/atf-run/test-program.cpp
diff -u src/external/bsd/atf/dist/atf-run/test-program.cpp:1.9 src/external/bsd/atf/dist/atf-run/test-program.cpp:1.10
--- src/external/bsd/atf/dist/atf-run/test-program.cpp:1.9 Tue Jun 14 15:26:21 2011
+++ src/external/bsd/atf/dist/atf-run/test-program.cpp Wed Jun 15 08:48:36 2011
@@ -31,6 +31,7 @@
#include sys/types.h
#include sys/stat.h
+#include fcntl.h
#include signal.h
#include unistd.h
}
@@ -220,6 +221,17 @@
static
void
+silence_stdin(void)
+{
+::close(STDIN_FILENO);
+int fd = ::open(/dev/null, O_RDONLY);
+if (fd == -1)
+throw std::runtime_error(Could not open /dev/null);
+INV(fd == STDIN_FILENO);
+}
+
+static
+void
prepare_child(const atf::fs::path workdir)
{
const int ret = ::setpgid(::getpid(), 0);
@@ -244,6 +256,8 @@
atf::env::set(__RUNNING_INSIDE_ATF_RUN, internal-yes-value);
impl::change_directory(workdir);
+
+silence_stdin();
}
static
Index: src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
diff -u src/external/bsd/atf/dist/atf-sh/atf-check_test.sh:1.3 src/external/bsd/atf/dist/atf-sh/atf-check_test.sh:1.4
--- src/external/bsd/atf/dist/atf-sh/atf-check_test.sh:1.3 Thu Mar 31 16:44:17 2011
+++ src/external/bsd/atf/dist/atf-sh/atf-check_test.sh Wed Jun 15 08:48:36 2011
@@ -400,6 +400,17 @@
h_fail echo foo bar 12 -e not-match:foo
}
+atf_test_case stdin
+stdin_head()
+{
+atf_set descr Tests that stdin is preserved
+}
+stdin_body()
+{
+echo hello | ${Atf_Check} -o match:hello cat || \
+atf_fail atf-check does not seem to respect stdin
+}
+
atf_test_case invalid_umask
invalid_umask_head()
{
@@ -444,6 +455,8 @@
atf_add_test_case eflag_multiple
atf_add_test_case eflag_negated
+atf_add_test_case stdin
+
atf_add_test_case invalid_umask
}
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Tue Jun 14 15:23:30 UTC 2011 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17790 Log Message: Import atf-0.14: Experimental version released on June 14th, 2011. * Added a pkg-config file for atf-sh and an aclocal file to ease the detection of atf-sh from autoconf scripts. * Made the default test case body defined by atf_sh fail. This is to ensure that test cases are properly defined in test programs and helps in catching typos in the names of the body functions. * PR bin/44882: Made atf-run connect the stdin of test cases to /dev/zero. This provides more consistent results with normal execution (in particular, when tests are executed detached from a terminal). * Made atf-run hardcode TZ=UTC for test cases. It used to undefine TZ, but that does not take into account that libc determines the current timezone from a configuration file. * All test programs will now print a warning when they are not run through atf-run(1) stating that this is unsupported and may deliver incorrect results. * Added support for the 'require.files' test-case property. This allows test cases to specify installed files that must be present for the test case to run. Status: Vendor Tag: TNF Release Tags: atf-0-14 U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Atffile U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/Kyuafile U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/macros.h C src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/utils.h U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh C src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c U src/external/bsd/atf/dist/atf-c/error.c U src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tp.c U src/external/bsd/atf/dist/atf-c/utils.c U src/external/bsd/atf/dist/atf-c/h_build.h U src/external/bsd/atf/dist/atf-c/atf_c_test.c U src/external/bsd/atf/dist/atf-c/build_test.c U src/external/bsd/atf/dist/atf-c/check_test.c U src/external/bsd/atf/dist/atf-c/config_test.c U src/external/bsd/atf/dist/atf-c/tc_test.c U src/external/bsd/atf/dist/atf-c/error_test.c U src/external/bsd/atf/dist/atf-c/macros_test.c U src/external/bsd/atf/dist/atf-c/tp_test.c U src/external/bsd/atf/dist/atf-c/utils_test.c U src/external/bsd/atf/dist/atf-c/atf-c.pc.in U src/external/bsd/atf/dist/atf-c/Atffile U src/external/bsd/atf/dist/atf-c/Kyuafile U src/external/bsd/atf/dist/atf-c/macros_h_test.c U src/external/bsd/atf/dist/atf-c/detail/process_helpers.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers.h U src/external/bsd/atf/dist/atf-c/detail/dynstr.c U src/external/bsd/atf/dist/atf-c/detail/dynstr.h U src/external/bsd/atf/dist/atf-c/detail/env.c U src/external/bsd/atf/dist/atf-c/detail/env.h U src/external/bsd/atf/dist/atf-c/detail/fs.c U src/external/bsd/atf/dist/atf-c/detail/fs.h U src/external/bsd/atf/dist/atf-c/detail/list.c U src/external/bsd/atf/dist/atf-c/detail/list.h U src/external/bsd/atf/dist/atf-c/detail/map.c U src/external/bsd/atf/dist/atf-c/detail/map.h C src/external/bsd/atf/dist/atf-c/detail/process.c C src/external/bsd/atf/dist/atf-c/detail/process.h U src/external/bsd/atf/dist/atf-c/detail/sanity.c U src/external/bsd/atf/dist/atf-c/detail/sanity.h U src/external/bsd/atf/dist/atf-c/detail/text.c U src/external/bsd/atf/dist/atf-c/detail/text.h U src/external/bsd/atf/dist/atf-c/detail/tp_main.c U src/external/bsd/atf/dist/atf-c/detail/user.c U src/external/bsd/atf/dist/atf-c/detail/user.h U src/external/bsd/atf/dist/atf-c/detail/dynstr_test.c U src/external/bsd/atf/dist/atf-c/detail/env_test.c U src/external/bsd/atf/dist/atf-c/detail/fs_test.c U src/external/bsd/atf/dist/atf-c/detail/list_test.c U src/external/bsd/atf/dist/atf-c/detail/map_test.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers_test.c C src/external/bsd/atf/dist/atf-c/detail/process_test.c U src/external/bsd/atf/dist/atf-c/detail/sanity_test.c U src/external/bsd/atf/dist/atf-c/detail/text_test.c U src/external/bsd/atf/dist/atf-c/detail/user_test.c U src/external/bsd/atf/dist/atf-c/detail/Atffile U src/external/bsd/atf/dist/atf-c/detail/Kyuafile U src/external/bsd/atf/dist/atf-c++/atf-c++-api.3 U src/external/bsd/atf/dist/atf-c++/build.hpp U src/external/bsd/atf/dist/atf-c++/check.hpp U
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Tue Jun 14 15:26:21 UTC 2011 Modified Files: src/external/bsd/atf/dist/atf-c: defs.h.in tc.h src/external/bsd/atf/dist/atf-c++: tests.cpp src/external/bsd/atf/dist/atf-c/detail: process.c src/external/bsd/atf/dist/atf-run: atf-run.cpp integration_test.sh test-program.cpp test_program_test.cpp src/external/bsd/atf/dist/doc: atf-test-case.4 Log Message: Post-import merge of atf-0.14. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-c/defs.h.in \ src/external/bsd/atf/dist/atf-c/tc.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/atf-c++/tests.cpp cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-c/detail/process.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/dist/atf-run/atf-run.cpp cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/atf/dist/atf-run/integration_test.sh \ src/external/bsd/atf/dist/atf-run/test_program_test.cpp cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/dist/atf-run/test-program.cpp cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/doc/atf-test-case.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/defs.h.in diff -u src/external/bsd/atf/dist/atf-c/defs.h.in:1.2 src/external/bsd/atf/dist/atf-c/defs.h.in:1.3 --- src/external/bsd/atf/dist/atf-c/defs.h.in:1.2 Sat Jun 11 18:03:57 2011 +++ src/external/bsd/atf/dist/atf-c/defs.h.in Tue Jun 14 15:26:20 2011 @@ -1,7 +1,7 @@ /* * Automated Testing Framework (atf) * - * Copyright (c) 2008 The NetBSD Foundation, Inc. + * Copyright (c) 2008, 2011 The NetBSD Foundation, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,6 +30,7 @@ #if !defined(ATF_C_DEFS_H) #define ATF_C_DEFS_H +#define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) @ATTRIBUTE_FORMAT_PRINTF@ #define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@ #define ATF_DEFS_ATTRIBUTE_PRINTF(a,b) @ATTRIBUTE_PRINTF(a,b)@ Index: src/external/bsd/atf/dist/atf-c/tc.h diff -u src/external/bsd/atf/dist/atf-c/tc.h:1.2 src/external/bsd/atf/dist/atf-c/tc.h:1.3 --- src/external/bsd/atf/dist/atf-c/tc.h:1.2 Sat Jun 11 18:03:57 2011 +++ src/external/bsd/atf/dist/atf-c/tc.h Tue Jun 14 15:26:20 2011 @@ -1,7 +1,7 @@ /* * Automated Testing Framework (atf) * - * Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc. + * Copyright (c) 2008, 2009, 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,33 +104,33 @@ /* To be run from test case bodies only. */ void atf_tc_fail(const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(1, 2) +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2) ATF_DEFS_ATTRIBUTE_NORETURN; void atf_tc_fail_nonfatal(const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(1, 2); +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2); void atf_tc_pass(void) ATF_DEFS_ATTRIBUTE_NORETURN; void atf_tc_require_prog(const char *); void atf_tc_skip(const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(1, 2) +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2) ATF_DEFS_ATTRIBUTE_NORETURN; void atf_tc_expect_pass(void); void atf_tc_expect_fail(const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(1, 2); +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2); void atf_tc_expect_exit(const int, const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(2, 3); +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3); void atf_tc_expect_signal(const int, const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(2, 3); +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3); void atf_tc_expect_death(const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(1, 2); +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2); void atf_tc_expect_timeout(const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(1, 2); +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2); /* To be run from test case bodies only; internal to macros.h. */ void atf_tc_fail_check(const char *, const size_t, const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(3, 4); +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(3, 4); void atf_tc_fail_requirement(const char *, const size_t, const char *, ...) -ATF_DEFS_ATTRIBUTE_PRINTF(3, 4) +ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(3, 4) ATF_DEFS_ATTRIBUTE_NORETURN; void atf_tc_check_errno(const char *, const size_t, const int, const char *, const bool); Index: src/external/bsd/atf/dist/atf-c++/tests.cpp diff -u src/external/bsd/atf/dist/atf-c++/tests.cpp:1.6 src/external/bsd/atf/dist/atf-c++/tests.cpp:1.7 --- src/external/bsd/atf/dist/atf-c++/tests.cpp:1.6 Sun Nov 7 17:45:22 2010 +++ src/external/bsd/atf/dist/atf-c++/tests.cpp Tue Jun 14 15:26:20 2011 @@ -1,7 +1,7 @@ // // Automated Testing Framework (atf) // -// Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc. +// Copyright (c) 2007, 2008, 2009, 2010, 2011 The
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Jun 14 15:27:11 UTC 2011
Modified Files:
src/external/bsd/atf: prepare-import.sh
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Log Message:
Update reachover build files for atf-0.14.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/prepare-import.sh
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-sh/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/prepare-import.sh
diff -u src/external/bsd/atf/prepare-import.sh:1.4 src/external/bsd/atf/prepare-import.sh:1.5
--- src/external/bsd/atf/prepare-import.sh:1.4 Thu Mar 31 16:45:44 2011
+++ src/external/bsd/atf/prepare-import.sh Tue Jun 14 15:27:11 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.4 2011/03/31 16:45:44 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.5 2011/06/14 15:27:11 jmmv Exp $
#
# Use this script to recreate the 'dist' subdirectory from a newly released
# distfile. The script takes care of unpacking the distfile, removing any
@@ -16,6 +16,7 @@
CLEAN_PATTERNS=${CLEAN_PATTERNS} INSTALL TODO
CLEAN_PATTERNS=${CLEAN_PATTERNS} Makefile* */Makefile* */*/Makefile*
CLEAN_PATTERNS=${CLEAN_PATTERNS} admin
+CLEAN_PATTERNS=${CLEAN_PATTERNS} atf-sh/atf-sh.m4
CLEAN_PATTERNS=${CLEAN_PATTERNS} bconfig.h.in
CLEAN_PATTERNS=${CLEAN_PATTERNS} bootstrap
CLEAN_PATTERNS=${CLEAN_PATTERNS} configure*
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.11 src/external/bsd/atf/lib/libatf-c/Makefile:1.12
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.11 Sat Jun 11 18:03:57 2011
+++ src/external/bsd/atf/lib/libatf-c/Makefile Tue Jun 14 15:27:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/06/11 18:03:57 christos Exp $
+# $NetBSD: Makefile,v 1.12 2011/06/14 15:27:11 jmmv Exp $
NOLINT= # defined
@@ -76,8 +76,8 @@
defs.h: defs.h.in
${TOOL_SED} \
+ -e 's|@ATTRIBUTE_FORMAT_PRINTF@|__attribute__((__format__(__printf__, a, b)))|g' \
-e 's|@ATTRIBUTE_NORETURN@|__attribute__((__noreturn__))|g' \
- -e 's|@ATTRIBUTE_PRINTF(a,b)@|__attribute__((__format__(__printf__,a,b)))|g' \
${.ALLSRC} ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
@@ -87,7 +87,7 @@
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.13,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.8 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.9
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.8 Thu Mar 31 16:45:44 2011
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Tue Jun 14 15:27:11 2011
@@ -96,7 +96,7 @@
#define PACKAGE_NAME Automated Testing Framework
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING Automated Testing Framework 0.13
+#define PACKAGE_STRING Automated Testing Framework 0.14
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME atf
@@ -105,10 +105,10 @@
#define PACKAGE_URL http://www.NetBSD.org/~jmmv/atf/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 0.13
+#define PACKAGE_VERSION 0.14
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 0.13
+#define VERSION 0.14
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.10 src/external/bsd/atf/lib/libatf-c++/Makefile:1.11
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.10 Tue Apr 5 16:37:06 2011
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Tue Jun 14 15:27:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/04/05 16:37:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2011/06/14 15:27:11 jmmv Exp $
NOLINT= # defined
@@ -55,7 +55,7 @@
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.13,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.4 Sun Feb 20 20:18:57 2011
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Tue Jun 14 15:27:11
CVS commit: src/external/bsd/atf/dist/atf-c
Module Name:src Committed By: christos Date: Wed Jun 15 01:45:16 UTC 2011 Modified Files: src/external/bsd/atf/dist/atf-c: defs.h.in Log Message: remove merge botch. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c/defs.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/defs.h.in diff -u src/external/bsd/atf/dist/atf-c/defs.h.in:1.3 src/external/bsd/atf/dist/atf-c/defs.h.in:1.4 --- src/external/bsd/atf/dist/atf-c/defs.h.in:1.3 Tue Jun 14 11:26:20 2011 +++ src/external/bsd/atf/dist/atf-c/defs.h.in Tue Jun 14 21:45:16 2011 @@ -32,6 +32,5 @@ #define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) @ATTRIBUTE_FORMAT_PRINTF@ #define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@ -#define ATF_DEFS_ATTRIBUTE_PRINTF(a,b) @ATTRIBUTE_PRINTF(a,b)@ #endif /* !defined(ATF_C_DEFS_H) */
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: christos
Date: Sat Jun 11 18:03:57 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-c: defs.h.in tc.h
src/external/bsd/atf/lib/libatf-c: Makefile
Log Message:
turn on printf warnings for all the printf-like atf functions.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/atf-c/defs.h.in
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/atf/dist/atf-c/tc.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/lib/libatf-c/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/defs.h.in
diff -u src/external/bsd/atf/dist/atf-c/defs.h.in:1.1.1.1 src/external/bsd/atf/dist/atf-c/defs.h.in:1.2
--- src/external/bsd/atf/dist/atf-c/defs.h.in:1.1.1.1 Mon Jan 19 02:11:51 2009
+++ src/external/bsd/atf/dist/atf-c/defs.h.in Sat Jun 11 14:03:57 2011
@@ -31,5 +31,6 @@
#define ATF_C_DEFS_H
#define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@
+#define ATF_DEFS_ATTRIBUTE_PRINTF(a,b) @ATTRIBUTE_PRINTF(a,b)@
#endif /* !defined(ATF_C_DEFS_H) */
Index: src/external/bsd/atf/dist/atf-c/tc.h
diff -u src/external/bsd/atf/dist/atf-c/tc.h:1.1.1.7 src/external/bsd/atf/dist/atf-c/tc.h:1.2
--- src/external/bsd/atf/dist/atf-c/tc.h:1.1.1.7 Sun Nov 7 12:43:22 2010
+++ src/external/bsd/atf/dist/atf-c/tc.h Sat Jun 11 14:03:57 2011
@@ -103,22 +103,35 @@
atf_error_t atf_tc_cleanup(const atf_tc_t *);
/* To be run from test case bodies only. */
-void atf_tc_fail(const char *, ...) ATF_DEFS_ATTRIBUTE_NORETURN;
-void atf_tc_fail_nonfatal(const char *, ...);
-void atf_tc_pass(void) ATF_DEFS_ATTRIBUTE_NORETURN;
+void atf_tc_fail(const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(1, 2)
+ATF_DEFS_ATTRIBUTE_NORETURN;
+void atf_tc_fail_nonfatal(const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(1, 2);
+void atf_tc_pass(void)
+ATF_DEFS_ATTRIBUTE_NORETURN;
void atf_tc_require_prog(const char *);
-void atf_tc_skip(const char *, ...) ATF_DEFS_ATTRIBUTE_NORETURN;
+void atf_tc_skip(const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(1, 2)
+ATF_DEFS_ATTRIBUTE_NORETURN;
void atf_tc_expect_pass(void);
-void atf_tc_expect_fail(const char *, ...);
-void atf_tc_expect_exit(const int, const char *, ...);
-void atf_tc_expect_signal(const int, const char *, ...);
-void atf_tc_expect_death(const char *, ...);
-void atf_tc_expect_timeout(const char *, ...);
+void atf_tc_expect_fail(const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(1, 2);
+void atf_tc_expect_exit(const int, const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(2, 3);
+void atf_tc_expect_signal(const int, const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(2, 3);
+void atf_tc_expect_death(const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(1, 2);
+void atf_tc_expect_timeout(const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(1, 2);
/* To be run from test case bodies only; internal to macros.h. */
-void atf_tc_fail_check(const char *, const size_t, const char *, ...);
+void atf_tc_fail_check(const char *, const size_t, const char *, ...)
+ATF_DEFS_ATTRIBUTE_PRINTF(3, 4);
void atf_tc_fail_requirement(const char *, const size_t, const char *, ...)
- ATF_DEFS_ATTRIBUTE_NORETURN;
+ATF_DEFS_ATTRIBUTE_PRINTF(3, 4)
+ATF_DEFS_ATTRIBUTE_NORETURN;
void atf_tc_check_errno(const char *, const size_t, const int,
const char *, const bool);
void atf_tc_require_errno(const char *, const size_t, const int,
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.10 src/external/bsd/atf/lib/libatf-c/Makefile:1.11
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.10 Thu Mar 31 12:45:44 2011
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sat Jun 11 14:03:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/03/31 16:45:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2011/06/11 18:03:57 christos Exp $
NOLINT= # defined
@@ -75,8 +75,9 @@
CLEANFILES+= defs.h
defs.h: defs.h.in
- ${TOOL_SED} -e \
- 's,@ATTRIBUTE_NORETURN@,__attribute__((__noreturn__)),g' \
+ ${TOOL_SED} \
+ -e 's|@ATTRIBUTE_NORETURN@|__attribute__((__noreturn__))|g' \
+ -e 's|@ATTRIBUTE_PRINTF(a,b)@|__attribute__((__format__(__printf__,a,b)))|g' \
${.ALLSRC} ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
CVS commit: src/external/bsd/atf/lib/libatf-c++
Module Name:src
Committed By: jmmv
Date: Tue Apr 5 16:37:07 UTC 2011
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
Log Message:
Set LIBISCXX=yes; from joerg@.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/lib/libatf-c++/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.9 src/external/bsd/atf/lib/libatf-c++/Makefile:1.10
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.9 Thu Mar 31 16:45:45 2011
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Tue Apr 5 16:37:06 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2011/03/31 16:45:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2011/04/05 16:37:06 jmmv Exp $
NOLINT= # defined
.include bsd.own.mk
LIB= atf-c++
+LIBISCXX= yes
LDADD= -L${.OBJDIR}/../libatf-c -latf-c
DPADD= ${LIBATF_C}
NOPIC= # defined; interface is still too unstable
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Tue Apr 5 17:17:35 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-c++/detail: process.hpp
src/external/bsd/atf/dist/atf-c/detail: process.c process.h
process_test.c
src/external/bsd/atf/dist/atf-run: atf-run.cpp
Log Message:
Pull up revision b94e200f2a6ce3d47103339db1f3c8936b7238d3:
Unset TERM when running GDB
GDB inserts some funny control characters in its output when TERM is set to
e.g. xterm. Workaround this by simply unsetting TERM.
Reported by martin@ and diagnosed by pooka@/martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/atf/dist/atf-c++/detail/process.hpp
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/atf-c/detail/process.c \
src/external/bsd/atf/dist/atf-c/detail/process.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/atf/dist/atf-c/detail/process_test.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/dist/atf-run/atf-run.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c++/detail/process.hpp
diff -u src/external/bsd/atf/dist/atf-c++/detail/process.hpp:1.1.1.1 src/external/bsd/atf/dist/atf-c++/detail/process.hpp:1.2
--- src/external/bsd/atf/dist/atf-c++/detail/process.hpp:1.1.1.1 Wed Oct 20 09:14:21 2010
+++ src/external/bsd/atf/dist/atf-c++/detail/process.hpp Tue Apr 5 17:17:35 2011
@@ -1,7 +1,7 @@
//
// Automated Testing Framework (atf)
//
-// Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
+// Copyright (c) 2008, 2009, 2010, 2011 The NetBSD Foundation, Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -118,7 +118,7 @@
child fork(void (*)(void*), const OutStream, const ErrStream, void*);
template class OutStream, class ErrStream friend
status exec(const atf::fs::path, const argv_array,
-const OutStream, const ErrStream);
+const OutStream, const ErrStream, void (*)(void));
public:
stream_capture(void);
@@ -130,7 +130,7 @@
child fork(void (*)(void*), const OutStream, const ErrStream, void*);
template class OutStream, class ErrStream friend
status exec(const atf::fs::path, const argv_array,
-const OutStream, const ErrStream);
+const OutStream, const ErrStream, void (*)(void));
public:
stream_connect(const int, const int);
@@ -142,7 +142,7 @@
child fork(void (*)(void*), const OutStream, const ErrStream, void*);
template class OutStream, class ErrStream friend
status exec(const atf::fs::path, const argv_array,
-const OutStream, const ErrStream);
+const OutStream, const ErrStream, void (*)(void));
public:
stream_inherit(void);
@@ -154,7 +154,7 @@
child fork(void (*)(void*), const OutStream, const ErrStream, void*);
template class OutStream, class ErrStream friend
status exec(const atf::fs::path, const argv_array,
-const OutStream, const ErrStream);
+const OutStream, const ErrStream, void (*)(void));
public:
stream_redirect_fd(const int);
@@ -166,7 +166,7 @@
child fork(void (*)(void*), const OutStream, const ErrStream, void*);
template class OutStream, class ErrStream friend
status exec(const atf::fs::path, const argv_array,
-const OutStream, const ErrStream);
+const OutStream, const ErrStream, void (*)(void));
public:
stream_redirect_path(const fs::path);
@@ -182,7 +182,7 @@
friend class child;
template class OutStream, class ErrStream friend
status exec(const atf::fs::path, const argv_array,
-const OutStream, const ErrStream);
+const OutStream, const ErrStream, void (*)(void));
status(atf_process_status_t);
@@ -249,7 +249,8 @@
template class OutStream, class ErrStream
status
exec(const atf::fs::path prog, const argv_array argv,
- const OutStream outsb, const ErrStream errsb)
+ const OutStream outsb, const ErrStream errsb,
+ void (*prehook)(void))
{
atf_process_status_t s;
@@ -257,13 +258,22 @@
atf_error_t err = atf_process_exec_array(s, prog.c_path(),
argv.exec_argv(),
outsb.get_sb(),
- errsb.get_sb());
+ errsb.get_sb(),
+ prehook);
if (atf_is_error(err))
throw_atf_error(err);
return status(s);
}
+template class OutStream, class ErrStream
+status
+exec(const atf::fs::path prog, const argv_array argv,
+ const OutStream outsb, const ErrStream errsb)
+{
+return exec(prog, argv, outsb, errsb, NULL);
+}
+
} // namespace process
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Thu Mar 31 16:41:17 UTC 2011 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24817 Log Message: Import atf-0.13: Experimental version released on March 31st, 2011. This is the first release after the creation of the Kyua project, a more modular and reliable replacement for ATF. From now on, ATF will change to accomodate the transition to this new codebase, but ATF will still continue to see development in the short/medium term. Check out the project page at http://code.google.com/p/kyua/ for more details. The changes in this release are: * Added support to run the tests with the Kyua runtime engine (kyua-cli), a new package that aims to replace atf-run and atf-report. The ATF tests can be run with the new system by issuing a 'make installcheck-kyua' from the top-level directory of the project (assuming the 'kyua' binary is available during the configuration stage of ATF). * atf-run and atf-report are now in maintenance mode (but *not* deprecated yet!). Kyua already implements a new, much more reliable runtime engine that provides similar features to these tools. That said, it is not complete yet so all development efforts should go towards it. * If GDB is installed, atf-run dumps the stack trace of crashing test programs in an attempt to aid debugging. Contributed by Antti Kantee. * Reverted default timeout change in previous release and reset its value to 5 minutes. This was causing several issues, specially when running the existing NetBSD test suite in qemu. * Fixed the 'match' output checker in atf-check to properly validate the last line of a file even if it does not have a newline. * Added the ATF_REQUIRE_IN and ATF_REQUIRE_NOT_IN macros to atf-c++ to check for the presence (or lack thereof) of an element in a collection. * PR bin/44176: Fixed a race condition in atf-run that would crash atf-run when the cleanup of a test case triggered asynchronous modifications to its work directory (e.g. killing a daemon process that cleans up a pid file in the work directory). * PR bin/44301: Fixed the sample XSLT file to report bogus test programs instead of just listing them as having 0 test cases. Status: Vendor Tag: TNF Release Tags: atf-0-13 U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Atffile U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/NEWS N src/external/bsd/atf/dist/Kyuafile U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/utils.h U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh U src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c U src/external/bsd/atf/dist/atf-c/error.c U src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tp.c U src/external/bsd/atf/dist/atf-c/utils.c U src/external/bsd/atf/dist/atf-c/h_build.h U src/external/bsd/atf/dist/atf-c/atf_c_test.c U src/external/bsd/atf/dist/atf-c/build_test.c U src/external/bsd/atf/dist/atf-c/check_test.c U src/external/bsd/atf/dist/atf-c/config_test.c U src/external/bsd/atf/dist/atf-c/tc_test.c U src/external/bsd/atf/dist/atf-c/error_test.c U src/external/bsd/atf/dist/atf-c/macros_test.c U src/external/bsd/atf/dist/atf-c/tp_test.c U src/external/bsd/atf/dist/atf-c/utils_test.c U src/external/bsd/atf/dist/atf-c/atf-c.pc.in C src/external/bsd/atf/dist/atf-c/Atffile N src/external/bsd/atf/dist/atf-c/Kyuafile U src/external/bsd/atf/dist/atf-c/macros_h_test.c U src/external/bsd/atf/dist/atf-c/detail/process_helpers.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers.h U src/external/bsd/atf/dist/atf-c/detail/dynstr.c U src/external/bsd/atf/dist/atf-c/detail/dynstr.h U src/external/bsd/atf/dist/atf-c/detail/env.c U src/external/bsd/atf/dist/atf-c/detail/env.h U src/external/bsd/atf/dist/atf-c/detail/fs.c U src/external/bsd/atf/dist/atf-c/detail/fs.h U src/external/bsd/atf/dist/atf-c/detail/list.c U src/external/bsd/atf/dist/atf-c/detail/list.h U src/external/bsd/atf/dist/atf-c/detail/map.c U src/external/bsd/atf/dist/atf-c/detail/map.h U src/external/bsd/atf/dist/atf-c/detail/process.c U src/external/bsd/atf/dist/atf-c/detail/process.h U src/external/bsd/atf/dist/atf-c/detail/sanity.c U src/external/bsd/atf/dist/atf-c/detail/sanity.h U src/external/bsd/atf/dist/atf-c/detail/text.c U
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Thu Mar 31 16:44:18 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-run: atf-run.cpp
src/external/bsd/atf/dist/atf-sh: atf-check.cpp atf-check_test.sh
src/external/bsd/atf/dist/doc: atf-test-case.4
Log Message:
Fix import conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/dist/atf-run/atf-run.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/doc/atf-test-case.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/atf-run.cpp
diff -u src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.9 src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.10
--- src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.9 Fri Mar 4 09:04:06 2011
+++ src/external/bsd/atf/dist/atf-run/atf-run.cpp Thu Mar 31 16:44:17 2011
@@ -1,7 +1,7 @@
//
// Automated Testing Framework (atf)
//
-// Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
+// Copyright (c) 2007, 2008, 2009, 2010, 2011 The NetBSD Foundation, Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -99,6 +99,45 @@
int main(void);
};
+static void
+dump_stacktrace(const atf::fs::path tp, const atf::process::status s,
+const atf::fs::path workdir, impl::atf_tps_writer w)
+{
+PRE(s.signaled() s.coredump());
+
+w.stderr_tc(Test program crashed; attempting to get stack trace);
+
+const atf::fs::path corename = workdir / (tp.leaf_name() + .core);
+if (!atf::fs::exists(corename)) {
+w.stderr_tc(Expected file + corename.str() + not found);
+return;
+}
+
+const atf::fs::path gdb(GDB);
+const atf::fs::path gdbout = workdir / gdb.out;
+const atf::process::argv_array args(gdb.leaf_name().c_str(), -batch,
+-q, -ex, bt, tp.c_str(),
+corename.c_str(), NULL);
+atf::process::status status = atf::process::exec(
+gdb, args,
+atf::process::stream_redirect_path(gdbout),
+atf::process::stream_redirect_path(atf::fs::path(/dev/null)));
+if (!status.exited() || status.exitstatus() != EXIT_SUCCESS) {
+w.stderr_tc(Execution of GDB failed);
+return;
+}
+
+std::ifstream input(gdbout.c_str());
+if (input) {
+std::string line;
+while (std::getline(input, line).good())
+w.stderr_tc(line);
+input.close();
+}
+
+w.stderr_tc(Stack trace complete);
+}
+
const char* atf_run::m_description =
atf-run is a tool that runs tests programs and collects their
results.;
@@ -370,8 +409,8 @@
if (user.first != -1 user.second != -1) {
if (::chown(workdir.get_path().c_str(), user.first,
user.second) == -1) {
-throw atf::system_error(chmod( +
-workdir.get_path().str() + ), chmod(2) failed,
+throw atf::system_error(chown( +
+workdir.get_path().str() + ), chown(2) failed,
errno);
}
resfile = workdir.get_path() / tcr;
@@ -380,45 +419,17 @@
std::pair std::string, const atf::process::status s =
impl::run_test_case(tp, tcname, body, tcmd, config,
resfile, workdir.get_path(), w);
+if (s.second.signaled() s.second.coredump())
+dump_stacktrace(tp, s.second, workdir.get_path(), w);
+if (has_cleanup)
+(void)impl::run_test_case(tp, tcname, cleanup, tcmd,
+config, resfile, workdir.get_path(), w);
// TODO: Force deletion of workdir.
impl::test_case_result tcr = get_test_case_result(s.first,
s.second, resfile);
- /* if we have a core, scope out stacktrace */
- size_t slashpos = tp.str().rfind(/);
- std::string corename = workdir.get_path().str()
- + std::string(/) + tp.str().substr(slashpos+1)
- + std::string(.core);
- if (s.second.signaled() s.second.coredump()
- access(corename.c_str(), F_OK) == 0) {
- std::string gdbcmd;
- char buf[256];
- char *p;
-
- gdbcmd = std::string(gdb -batch -q -ex bt ) +
- tp.str() + std::string( ) + corename +
- std::string( 2 /dev/null | grep -v ) +
- std::string('(no debugging symbols found)');
- FILE *gdbstrm = popen(gdbcmd.c_str(), r);
- if (gdbstrm) {
-w.stderr_tc(std::string(test program crashed,
-autolisting stacktrace:));
-while
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Thu Mar 31 16:45:45 UTC 2011
Modified Files:
src/external/bsd/atf: prepare-import.sh
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
Log Message:
Adjust reachover build files with the import of atf-0.13.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/prepare-import.sh
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/usr.bin/atf-run/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/prepare-import.sh
diff -u src/external/bsd/atf/prepare-import.sh:1.3 src/external/bsd/atf/prepare-import.sh:1.4
--- src/external/bsd/atf/prepare-import.sh:1.3 Wed Oct 20 08:56:16 2010
+++ src/external/bsd/atf/prepare-import.sh Thu Mar 31 16:45:44 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.3 2010/10/20 08:56:16 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.4 2011/03/31 16:45:44 jmmv Exp $
#
# Use this script to recreate the 'dist' subdirectory from a newly released
# distfile. The script takes care of unpacking the distfile, removing any
@@ -13,7 +13,7 @@
CLEAN_PATTERNS=
CLEAN_PATTERNS=${CLEAN_PATTERNS} *.m4
-CLEAN_PATTERNS=${CLEAN_PATTERNS} INSTALL
+CLEAN_PATTERNS=${CLEAN_PATTERNS} INSTALL TODO
CLEAN_PATTERNS=${CLEAN_PATTERNS} Makefile* */Makefile* */*/Makefile*
CLEAN_PATTERNS=${CLEAN_PATTERNS} admin
CLEAN_PATTERNS=${CLEAN_PATTERNS} bconfig.h.in
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.9 src/external/bsd/atf/lib/libatf-c/Makefile:1.10
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.9 Sun Feb 20 20:56:34 2011
+++ src/external/bsd/atf/lib/libatf-c/Makefile Thu Mar 31 16:45:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/02/20 20:56:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2011/03/31 16:45:44 jmmv Exp $
NOLINT= # defined
@@ -86,7 +86,7 @@
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.12,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.13,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.7 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.8
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.7 Sun Nov 7 17:46:46 2010
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Thu Mar 31 16:45:44 2011
@@ -90,13 +90,13 @@
#define PACKAGE_BUGREPORT atf-de...@netbsd.org
/* Define to the copyright string applicable to this package. */
-#define PACKAGE_COPYRIGHT Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
+#define PACKAGE_COPYRIGHT Copyright (c) 2007-2011 The NetBSD Foundation, Inc.
/* Define to the full name of this package. */
#define PACKAGE_NAME Automated Testing Framework
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING Automated Testing Framework 0.12
+#define PACKAGE_STRING Automated Testing Framework 0.13
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME atf
@@ -105,10 +105,10 @@
#define PACKAGE_URL http://www.NetBSD.org/~jmmv/atf/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 0.12
+#define PACKAGE_VERSION 0.13
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 0.12
+#define VERSION 0.13
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.8 src/external/bsd/atf/lib/libatf-c++/Makefile:1.9
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.8 Sun Feb 20 20:18:56 2011
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Thu Mar 31 16:45:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/02/20 20:18:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2011/03/31 16:45:45 jmmv Exp $
NOLINT= # defined
@@ -54,7 +54,7 @@
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.12,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.13,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.9 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.10
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.9 Sun Feb 20 20:18:57 2011
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Thu Mar 31 16:45:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9
CVS commit: src/external/bsd/atf/dist/atf-c
Module Name:src Committed By: jmmv Date: Thu Mar 24 19:50:30 UTC 2011 Modified Files: src/external/bsd/atf/dist/atf-c: Atffile Log Message: Enable the execution of pkg_config_test; it has been present for a while and it is even being built and installed already. Partial pull up of 0930d2c3f44a9c8fcaf0a960ab51c5e8f320684d. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-c/Atffile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/Atffile diff -u src/external/bsd/atf/dist/atf-c/Atffile:1.1.1.2 src/external/bsd/atf/dist/atf-c/Atffile:1.2 --- src/external/bsd/atf/dist/atf-c/Atffile:1.1.1.2 Wed Oct 20 09:14:19 2010 +++ src/external/bsd/atf/dist/atf-c/Atffile Thu Mar 24 19:50:30 2011 @@ -10,6 +10,7 @@ tp: config_test tp: error_test tp: macros_test +tp: pkg_config_test tp: tc_test tp: tp_test tp: utils_test
CVS commit: src/external/bsd/atf/dist/atf-run
Module Name:src Committed By: jmmv Date: Thu Mar 17 19:45:36 UTC 2011 Modified Files: src/external/bsd/atf/dist/atf-run: test-program.cpp Log Message: Pull up revision 3dd2481ec97b2fde76521939b6451d03ce989745 from upstream: Really kill subprocesses of a test case before waiting for its completion Before waiting for any leftover output of the test case after it terminates, we must ensure that all of its subprocess are really, really dead. Otherwise, these subprocesses may be sharing the stdout of the test case, in which case our wait will block (potentially indefinitely). This finally (well, hopefully) fixes some random lockups exposed by the NetBSD test suite. Reported by Antti Kantee after tests/fs/vfs/t_full:p2k_ffs_fillfs was exposing this problem in a pretty reproducible manner. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/dist/atf-run/test-program.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-run/test-program.cpp diff -u src/external/bsd/atf/dist/atf-run/test-program.cpp:1.7 src/external/bsd/atf/dist/atf-run/test-program.cpp:1.8 --- src/external/bsd/atf/dist/atf-run/test-program.cpp:1.7 Tue Nov 16 17:55:56 2010 +++ src/external/bsd/atf/dist/atf-run/test-program.cpp Thu Mar 17 19:45:36 2011 @@ -1,7 +1,7 @@ // // Automated Testing Framework (atf) // -// Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc. +// Copyright (c) 2007, 2008, 2009, 2010, 2011 The NetBSD Foundation, Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -724,10 +724,9 @@ UNREACHABLE; } -::killpg(child_pid, SIGTERM); +::killpg(child_pid, SIGKILL); mux.flush(); atf::process::status status = child.wait(); -::killpg(child_pid, SIGKILL); std::string reason;
CVS commit: src/external/bsd/atf/dist/atf-run
Module Name:src
Committed By: pooka
Date: Wed Mar 2 16:47:04 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-run: atf-run.cpp
Log Message:
In case we get a coredump from a test, autorun gdb to produce a
stacktrace (or whatever gdb can give us, which unfortunately is
usually not that much).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/dist/atf-run/atf-run.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/atf-run.cpp
diff -u src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.7 src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.8
--- src/external/bsd/atf/dist/atf-run/atf-run.cpp:1.7 Sun Nov 7 17:45:22 2010
+++ src/external/bsd/atf/dist/atf-run/atf-run.cpp Wed Mar 2 16:47:04 2011
@@ -380,15 +380,44 @@
std::pair std::string, const atf::process::status s =
impl::run_test_case(tp, tcname, body, tcmd, config,
resfile, workdir.get_path(), w);
-if (has_cleanup)
-(void)impl::run_test_case(tp, tcname, cleanup, tcmd,
-config, resfile, workdir.get_path(), w);
// TODO: Force deletion of workdir.
impl::test_case_result tcr = get_test_case_result(s.first,
s.second, resfile);
+ /* if we have a core, scope out stacktrace */
+ size_t slashpos = tp.str().rfind(/);
+ std::string corename = workdir.get_path().str()
+ + std::string(/) + tp.str().substr(slashpos+1)
+ + std::string(.core);
+ if (s.second.signaled() s.second.coredump()
+ access(corename.c_str(), F_OK) == 0) {
+ std::string gdbcmd;
+ char buf[256];
+ char *p;
+
+ gdbcmd = std::string(gdb -batch -q -ex bt ) +
+ tp.str() + std::string( ) + corename +
+ std::string( 2 /dev/null);
+ FILE *gdbstrm = popen(gdbcmd.c_str(), r);
+ if (gdbstrm) {
+w.stderr_tc(std::string(test program crashed,
+autolisting stacktrace:));
+while (fgets(buf, sizeof(buf), gdbstrm)) {
+ if ((p = strchr(buf, '\n')) != NULL)
+ *p = '\0';
+ w.stderr_tc(std::string(buf));
+}
+pclose(gdbstrm);
+w.stderr_tc(std::string(stacktrace complete));
+ }
+ }
+
+if (has_cleanup)
+(void)impl::run_test_case(tp, tcname, cleanup, tcmd,
+config, resfile, workdir.get_path(), w);
+
w.end_tc(tcr.state(), tcr.reason());
if (tcr.state() == failed)
errcode = EXIT_FAILURE;
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sun Feb 20 20:18:57 UTC 2011
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/libexec/atf-check: Makefile
src/external/bsd/atf/usr.bin/atf-config: Makefile
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Log Message:
Set DPADD to point to the static versions of libatf-c and libatf-c++ as
appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-check/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-version/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.7 src/external/bsd/atf/lib/libatf-c++/Makefile:1.8
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.7 Sun Feb 6 19:34:20 2011
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Feb 20 20:18:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/02/06 19:34:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/20 20:18:56 jmmv Exp $
NOLINT= # defined
@@ -6,7 +6,7 @@
LIB= atf-c++
LDADD= -L${.OBJDIR}/../libatf-c -latf-c
-DPADD= libatf-c.a
+DPADD= ${LIBATF_C}
NOPIC= # defined; interface is still too unstable
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
Index: src/external/bsd/atf/libexec/atf-check/Makefile
diff -u src/external/bsd/atf/libexec/atf-check/Makefile:1.1 src/external/bsd/atf/libexec/atf-check/Makefile:1.2
--- src/external/bsd/atf/libexec/atf-check/Makefile:1.1 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/libexec/atf-check/Makefile Sun Feb 20 20:18:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/20 20:18:56 jmmv Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@
MAN= atf-check.1
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${SRCDIR}
Index: src/external/bsd/atf/usr.bin/atf-config/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-config/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-config/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-config/Makefile:1.4 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-config/Makefile Sun Feb 20 20:18:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/20 20:18:57 jmmv Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@
MAN= atf-config.1
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${SRCDIR}
Index: src/external/bsd/atf/usr.bin/atf-report/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-report/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.4 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Sun Feb 20 20:18:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/20 20:18:57 jmmv Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@
MAN= atf-report.1
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${SRCDIR}
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.8 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.9
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.8 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sun Feb 20 20:18:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2011/02/20 20:18:57 jmmv Exp $
.include bsd.own.mk
@@ -17,6 +17,7 @@
CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
COPTS.atf-run.cpp+= -Wno-stack-protector
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.3 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.4
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.3 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Sun Feb 20 20:18:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2011/02/20 20:18:57 jmmv Exp $
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sun Feb 20 20:56:34 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-config: integration_test.sh
src/external/bsd/atf/lib/libatf-c: Makefile
Log Message:
Fix the values of atf_arch and atf_machine: the former is supposed to be
the cpu name and the latter the port name. They had been reversed until
now due to some smart stupidity^Wlogic in the upstream configure script,
which is now gone.
This is a pullup of revision f9329ca68da7e8557e0803b5747a12f8c10b1258
plus the corresponding reachover build changes.
Addresses PR bin/44305.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-config/integration_test.sh
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/lib/libatf-c/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-config/integration_test.sh
diff -u src/external/bsd/atf/dist/atf-config/integration_test.sh:1.1.1.3 src/external/bsd/atf/dist/atf-config/integration_test.sh:1.2
--- src/external/bsd/atf/dist/atf-config/integration_test.sh:1.1.1.3 Sun Nov 7 17:43:26 2010
+++ src/external/bsd/atf/dist/atf-config/integration_test.sh Sun Feb 20 20:56:34 2011
@@ -164,36 +164,6 @@
done
}
-# XXX: This does not seem to belong here...
-atf_test_case arch
-arch_head()
-{
-atf_set descr Tests that the current value of atf_arch is correct \
-for the corresponding atf_machine
-}
-arch_body()
-{
-atf_check -s eq:0 -o save:stdout -e empty atf-config -t atf_arch
-arch=$(cat stdout)
-atf_check -s eq:0 -o save:stdout -e empty atf-config -t atf_machine
-machine=$(cat stdout)
-echo Machine type ${machine}, architecture ${arch}
-
-case ${machine} in
-i386|i486|i586|i686)
-exp_arch=i386
-;;
-x86_64)
-exp_arch=amd64
-;;
-*)
-exp_arch=${machine}
-esac
-echo Expected architecture ${exp_arch}
-
-atf_check_equal ${arch} ${exp_arch}
-}
-
atf_init_test_cases()
{
atf_add_test_case list_all
@@ -205,8 +175,6 @@
atf_add_test_case query_mixture
atf_add_test_case override_env
-
-atf_add_test_case arch
}
# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.8 src/external/bsd/atf/lib/libatf-c/Makefile:1.9
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.8 Sun Nov 7 17:46:46 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Feb 20 20:56:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/07 17:46:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2011/02/20 20:56:34 jmmv Exp $
NOLINT= # defined
@@ -16,7 +16,7 @@
CPPFLAGS+= -I.
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -DATF_ARCH=\${MACHINE}\
+CPPFLAGS+= -DATF_ARCH=\${MACHINE_ARCH}\
CPPFLAGS+= -DATF_BUILD_CC=\/usr/bin/cc\
CPPFLAGS+= -DATF_BUILD_CFLAGS=\\
CPPFLAGS+= -DATF_BUILD_CPP=\/usr/bin/cpp\
@@ -27,12 +27,14 @@
CPPFLAGS+= -DATF_INCLUDEDIR=\/usr/include\
CPPFLAGS+= -DATF_LIBDIR=\/usr/lib\
CPPFLAGS+= -DATF_LIBEXECDIR=\/usr/libexec\
-CPPFLAGS+= -DATF_MACHINE=\${MACHINE_ARCH}\
+CPPFLAGS+= -DATF_MACHINE=\${MACHINE}\
CPPFLAGS+= -DATF_M4=\/usr/bin/m4\
CPPFLAGS+= -DATF_PKGDATADIR=\/usr/share/atf\
CPPFLAGS+= -DATF_SHELL=\/bin/sh\
CPPFLAGS+= -DATF_WORKDIR=\/tmp\
+config.o: Makefile
+
WARNS?= 4
SRCS= build.c \
CVS commit: src/external/bsd/atf/lib/libatf-c++
Module Name:src
Committed By: jmmv
Date: Sun Feb 6 19:34:20 UTC 2011
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
Log Message:
Add missing DPADD on libatf-c.a. Spotted by Garrett Cooper.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/lib/libatf-c++/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.6 src/external/bsd/atf/lib/libatf-c++/Makefile:1.7
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.6 Sun Nov 7 17:46:46 2010
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Feb 6 19:34:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/07 17:46:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2011/02/06 19:34:20 jmmv Exp $
NOLINT= # defined
@@ -6,6 +6,7 @@
LIB= atf-c++
LDADD= -L${.OBJDIR}/../libatf-c -latf-c
+DPADD= libatf-c.a
NOPIC= # defined; interface is still too unstable
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
CVS commit: src/external/bsd/atf/dist/atf-report
Module Name:src Committed By: jmmv Date: Wed Jan 5 14:03:08 UTC 2011 Modified Files: src/external/bsd/atf/dist/atf-report: tests-results.xsl Log Message: Cherry-pick upstream revision f791048924a1b68da070f17dfd5e5c2d825dd018: Report bogus test programs in the HTML output From Paul Goyette in private mail. Fixes PR bin/44301. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/atf/dist/atf-report/tests-results.xsl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-report/tests-results.xsl diff -u src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.4 src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.5 --- src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.4 Wed Oct 20 09:17:23 2010 +++ src/external/bsd/atf/dist/atf-report/tests-results.xsl Wed Jan 5 14:03:08 2011 @@ -86,6 +86,9 @@ xsl:if test=$ntcs-skipped 0 xsl:call-template name=skipped-tcs-summary / /xsl:if +xsl:if test=$ntps-failed 0 + xsl:call-template name=failed-tps-summary / +/xsl:if xsl:call-template name=info-bottom / xsl:apply-templates select=tp mode=details / @@ -167,14 +170,16 @@ td class=numericpxsl:value-of select=$ntps //p/td /tr tr class=entry -tdpBogus test programs/p/td xsl:choose xsl:when test=$ntps-failed 0 +tdpa href=#failed-tps-summaryBogus test +programs/a/p/td td class=numeric-error pxsl:value-of select=$ntps-failed //p /td /xsl:when xsl:otherwise +tdpBogus test programs/p/td td class=numeric pxsl:value-of select=$ntps-failed //p /td @@ -314,6 +319,20 @@ /table /xsl:template + xsl:template name=failed-tps-summary +a name=failed-tps-summary / +h2 id=failed-tps-summaryBogus test programs summary/h2 + +table class=tcs-summary + tr +thTest program/th + /tr + xsl:apply-templates select=tp mode=summary +xsl:with-param name=whichbogus/xsl:with-param + /xsl:apply-templates +/table + /xsl:template + xsl:template name=skipped-tcs-summary a name=skipped-tcs-summary / h2 id=skipped-tcs-summarySkipped test cases summary/h2 @@ -335,6 +354,7 @@ xsl:variable name=chosen xsl:choose +xsl:when test=$which = 'bogus' and failedyes/xsl:when xsl:when test=$which = 'passed' and tc/passedyes/xsl:when xsl:when test=$which = 'failed' and tc/failedyes/xsl:when xsl:when test=$which = 'xfail' and @@ -359,9 +379,11 @@ pxsl:value-of select=@id //p /td /tr - xsl:apply-templates select=tc mode=summary -xsl:with-param name=which select=$which / - /xsl:apply-templates + xsl:if test=$which != 'bogus' +xsl:apply-templates select=tc mode=summary + xsl:with-param name=which select=$which / +/xsl:apply-templates + /xsl:if /xsl:if /xsl:template
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: jmmv
Date: Mon Dec 27 20:36:17 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
Log Message:
Pull up revision 869e092e4986eb5dce90331ca9a64e125d7796eb from mainstream:
Revision: 869e092e4986eb5dce90331ca9a64e125d7796eb
Parent: cca40eb08e7469dfe9d6ca982613458f24c1de28
Author: j...@netbsd.org
Date: 12/27/10 21:19:19
Branch: org.NetBSD.atf.src
Changelog:
Recognize sigabrt in the signal checker
Problem found by Paul Goyette.
Changes against parent cca40eb08e7469dfe9d6ca982613458f24c1de28
patched atf-sh/atf-check.cpp
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.3 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.4
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.3 Mon Dec 6 18:04:02 2010
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Mon Dec 27 20:36:17 2010
@@ -184,6 +184,7 @@
{ int, SIGINT },
{ quit, SIGQUIT },
{ trap, SIGTRAP },
+{ abrt, SIGABRT },
{ kill, SIGKILL },
{ segv, SIGSEGV },
{ pipe, SIGPIPE },
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: jmmv
Date: Mon Dec 6 18:04:02 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-sh: atf-check.cpp atf-check_test.sh
Log Message:
Pull up revision c917871de7dd67ba57c17496ad68fe4e4aa8b239:
Fix atf-check match checker to validate lines without newline
Problem found by po...@.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.2 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.3
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.2 Fri Nov 26 12:04:36 2010
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Mon Dec 6 18:04:02 2010
@@ -378,7 +378,7 @@
bool found = false;
std::string line;
-while (!found std::getline(stream, line).good()) {
+while (!found !std::getline(stream, line).fail()) {
if (atf::text::match(line, regexp))
found = true;
}
Index: src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
diff -u src/external/bsd/atf/dist/atf-sh/atf-check_test.sh:1.1.1.2 src/external/bsd/atf/dist/atf-sh/atf-check_test.sh:1.2
--- src/external/bsd/atf/dist/atf-sh/atf-check_test.sh:1.1.1.2 Sun Nov 7 17:43:29 2010
+++ src/external/bsd/atf/dist/atf-sh/atf-check_test.sh Mon Dec 6 18:04:02 2010
@@ -234,6 +234,7 @@
}
oflag_match_body()
{
+h_pass printf no-newline -o match:^no-newline
h_pass echo line1; echo foo bar -o match:^foo
h_pass echo foo bar -o match:o b
h_fail echo foo bar -o match:baz
@@ -365,6 +366,7 @@
}
eflag_match_body()
{
+h_pass printf no-newline 12 -e match:^no-newline
h_pass echo line1 12; echo foo bar 12 -e match:^foo
h_pass echo foo bar 12 -e match:o b
h_fail echo foo bar 12 -e match:baz
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: pooka
Date: Fri Nov 26 12:04:36 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
Log Message:
Remove spammy (debug?) prints. took ages to figure out they were
not coming from my application...
XXX: the memcmp below looks suspicious
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.1.1.2 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.2
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.1.1.2 Sun Nov 7 17:43:28 2010
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Fri Nov 26 12:04:36 2010
@@ -421,8 +421,6 @@
if (f2.bad())
throw std::runtime_error(Failed to read from + p1.str());
-std::cout 1 read: f1.gcount() \n;
-std::cout 2 read: f2.gcount() \n;
if ((f1.gcount() == 0) (f2.gcount() == 0)) {
equal = true;
break;
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Tue Nov 16 17:55:56 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-run: test-program.cpp
test_program_test.cpp
src/external/bsd/atf/dist/doc: atf-test-case.4
Log Message:
Pull up 702fa99a25c1b27e4c501e4a504f36b74106ea97 from upstream
This reverts the default timeout for test cases back to 300 seconds.
The change in the release was quite blind because it did not anticipate
many existing tests to be slow enough to overflow the modified timeout
(30 seconds), specially in anita.
My plan to really fix this is to let test cases specify their sizes in
a declarative way instead of specifying timeouts in seconds (the timeout
being defined by atf-run on a size basis), so I'm not going to bother to
go over all existing tests trying to figure out which ones need a higher
timeout for now. It is just easier to revert.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/atf-run/test-program.cpp
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-run/test_program_test.cpp
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/atf/dist/doc/atf-test-case.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/test-program.cpp
diff -u src/external/bsd/atf/dist/atf-run/test-program.cpp:1.6 src/external/bsd/atf/dist/atf-run/test-program.cpp:1.7
--- src/external/bsd/atf/dist/atf-run/test-program.cpp:1.6 Sun Nov 7 17:45:22 2010
+++ src/external/bsd/atf/dist/atf-run/test-program.cpp Tue Nov 16 17:55:56 2010
@@ -110,7 +110,7 @@
m_tcs[ident].insert(std::make_pair(has.cleanup, false));
if (m_tcs[ident].find(timeout) == m_tcs[ident].end())
-m_tcs[ident].insert(std::make_pair(timeout, 30));
+m_tcs[ident].insert(std::make_pair(timeout, 300));
}
public:
Index: src/external/bsd/atf/dist/atf-run/test_program_test.cpp
diff -u src/external/bsd/atf/dist/atf-run/test_program_test.cpp:1.1.1.3 src/external/bsd/atf/dist/atf-run/test_program_test.cpp:1.2
--- src/external/bsd/atf/dist/atf-run/test_program_test.cpp:1.1.1.3 Sun Nov 7 17:43:28 2010
+++ src/external/bsd/atf/dist/atf-run/test_program_test.cpp Tue Nov 16 17:55:56 2010
@@ -190,7 +190,7 @@
\n
ident: test_case_1\n
descr: This is the description\n
-timeout: 30\n
+timeout: 300\n
\n
ident: test_case_2\n
\n
@@ -201,7 +201,7 @@
// NO_CHECK_STYLE_BEGIN
const char* exp_calls[] = {
-got_tc(test_case_1, {descr=This is the description, ident=test_case_1, timeout=30}),
+got_tc(test_case_1, {descr=This is the description, ident=test_case_1, timeout=300}),
got_tc(test_case_2, {ident=test_case_2}),
got_tc(test_case_3, {X-prop1=A custom property, descr=Third test case, ident=test_case_3}),
got_eof(),
@@ -224,7 +224,7 @@
\n
ident: single_test\n
descr: Some description\n
-timeout: 30\n
+timeout: 300\n
require.arch: thearch\n
require.config: foo-bar\n
require.machine: themachine\n
@@ -234,7 +234,7 @@
// NO_CHECK_STYLE_BEGIN
const char* exp_calls[] = {
-got_tc(single_test, {descr=Some description, ident=single_test, require.arch=thearch, require.config=foo-bar, require.machine=themachine, require.progs=/bin/cp mv, require.user=root, timeout=30}),
+got_tc(single_test, {descr=Some description, ident=single_test, require.arch=thearch, require.config=foo-bar, require.machine=themachine, require.progs=/bin/cp mv, require.user=root, timeout=300}),
got_eof(),
NULL
};
@@ -474,7 +474,7 @@
\n
\n
ident: test\n
-timeout: 30\n
+timeout: 300\n
;
const char* exp_calls[] = {
@@ -762,7 +762,7 @@
check_property((*iter).second, descr, Description 1);
check_property((*iter).second, has.cleanup, false);
check_property((*iter).second, ident, first);
-check_property((*iter).second, timeout, 30);
+check_property((*iter).second, timeout, 300);
}
{
@@ -786,7 +786,7 @@
ATF_REQUIRE_EQ(3, (*iter).second.size());
check_property((*iter).second, has.cleanup, false);
check_property((*iter).second, ident, third);
-check_property((*iter).second, timeout, 30);
+check_property((*iter).second, timeout, 300);
}
}
Index: src/external/bsd/atf/dist/doc/atf-test-case.4
diff -u src/external/bsd/atf/dist/doc/atf-test-case.4:1.1.1.6 src/external/bsd/atf/dist/doc/atf-test-case.4:1.2
--- src/external/bsd/atf/dist/doc/atf-test-case.4:1.1.1.6 Sun Nov 7 17:43:29 2010
+++ src/external/bsd/atf/dist/doc/atf-test-case.4 Tue Nov 16 17:55:56 2010
@@ -26,7 +26,7 @@
.\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\ IF ADVISED OF
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Sun Nov 7 17:43:34 UTC 2010
Update of /cvsroot/src/external/bsd/atf/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15245
Log Message:
Import atf 0.12:
Experimental version released on November 7th, 2010.
* Added the ATF_REQUIRE_THROW_RE to atf-c++, which is the same as
ATF_REQUIRE_THROW but allows checking for the validity of the exception's
error message by means of a regular expression.
* Added the ATF_REQUIRE_MATCH to atf-c++, which allows checking for a
regular expression match in a string.
* Changed the default timeout for test cases from 5 minutes to 30 seconds.
30 seconds is long enough for virtually all tests to complete, and 5
minutes is a way too long pause in a test suite where a single test case
stalls.
* Deprecated the use.fs property. While this seemed like a good idea in
the first place to impose more control on what test cases can do, it
turns out to be bad. First, use.fs=false prevents bogus test cases
from dumping core so after-the-fact debugging is harder. Second,
supporting use.fs adds a lot of unnecessary complexity. atf-run will
now ignore any value provided to use.fs and will allow test cases to
freely access the file system if they wish to.
* Added the atf_tc_get_config_var_as_{bool,long}{,_wd} functions to the atf-c
library. The 'text' module became private in 0.11 but was being used
externally to simplify the parsing of configuration variables.
* Made atf-run recognize the 'unprivileged-user' configuration variable
and automatically drop root privileges when a test case sets
require.user=unprivileged. Note that this is, by no means, done for
security purposes; this is just for user convenience; tests should, in
general, not be blindly run as root in the first place.
Status:
Vendor Tag: TNF
Release Tags: atf-0-12
U src/external/bsd/atf/dist/README
U src/external/bsd/atf/dist/atf-c.h
U src/external/bsd/atf/dist/atf-c++.hpp
U src/external/bsd/atf/dist/AUTHORS
U src/external/bsd/atf/dist/COPYING
U src/external/bsd/atf/dist/NEWS
U src/external/bsd/atf/dist/Atffile
U src/external/bsd/atf/dist/atf-c/error_fwd.h
U src/external/bsd/atf/dist/atf-c/build.h
U src/external/bsd/atf/dist/atf-c/check.h
U src/external/bsd/atf/dist/atf-c/config.h
U src/external/bsd/atf/dist/atf-c/error.h
U src/external/bsd/atf/dist/atf-c/atf-c-api.3
U src/external/bsd/atf/dist/atf-c/macros.h
U src/external/bsd/atf/dist/atf-c/tc.h
U src/external/bsd/atf/dist/atf-c/tp.h
U src/external/bsd/atf/dist/atf-c/utils.h
U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh
U src/external/bsd/atf/dist/atf-c/defs.h.in
U src/external/bsd/atf/dist/atf-c/build.c
U src/external/bsd/atf/dist/atf-c/check.c
U src/external/bsd/atf/dist/atf-c/config.c
U src/external/bsd/atf/dist/atf-c/error.c
C src/external/bsd/atf/dist/atf-c/tc.c
U src/external/bsd/atf/dist/atf-c/tp.c
U src/external/bsd/atf/dist/atf-c/utils.c
U src/external/bsd/atf/dist/atf-c/h_build.h
U src/external/bsd/atf/dist/atf-c/atf_c_test.c
U src/external/bsd/atf/dist/atf-c/build_test.c
U src/external/bsd/atf/dist/atf-c/check_test.c
U src/external/bsd/atf/dist/atf-c/config_test.c
U src/external/bsd/atf/dist/atf-c/tc_test.c
U src/external/bsd/atf/dist/atf-c/error_test.c
U src/external/bsd/atf/dist/atf-c/macros_test.c
U src/external/bsd/atf/dist/atf-c/tp_test.c
U src/external/bsd/atf/dist/atf-c/utils_test.c
U src/external/bsd/atf/dist/atf-c/atf-c.pc.in
U src/external/bsd/atf/dist/atf-c/Atffile
U src/external/bsd/atf/dist/atf-c/macros_h_test.c
U src/external/bsd/atf/dist/atf-c/detail/process_helpers.c
U src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
U src/external/bsd/atf/dist/atf-c/detail/test_helpers.h
U src/external/bsd/atf/dist/atf-c/detail/dynstr.c
U src/external/bsd/atf/dist/atf-c/detail/dynstr.h
U src/external/bsd/atf/dist/atf-c/detail/env.c
U src/external/bsd/atf/dist/atf-c/detail/env.h
U src/external/bsd/atf/dist/atf-c/detail/fs.c
U src/external/bsd/atf/dist/atf-c/detail/fs.h
U src/external/bsd/atf/dist/atf-c/detail/list.c
U src/external/bsd/atf/dist/atf-c/detail/list.h
U src/external/bsd/atf/dist/atf-c/detail/map.c
U src/external/bsd/atf/dist/atf-c/detail/map.h
U src/external/bsd/atf/dist/atf-c/detail/process.c
U src/external/bsd/atf/dist/atf-c/detail/process.h
U src/external/bsd/atf/dist/atf-c/detail/sanity.c
U src/external/bsd/atf/dist/atf-c/detail/sanity.h
U src/external/bsd/atf/dist/atf-c/detail/text.c
U src/external/bsd/atf/dist/atf-c/detail/text.h
U src/external/bsd/atf/dist/atf-c/detail/tp_main.c
U src/external/bsd/atf/dist/atf-c/detail/user.c
U src/external/bsd/atf/dist/atf-c/detail/user.h
U src/external/bsd/atf/dist/atf-c/detail/dynstr_test.c
U src/external/bsd/atf/dist/atf-c/detail/env_test.c
U src/external/bsd/atf/dist/atf-c/detail/fs_test.c
U src/external/bsd/atf/dist/atf-c/detail/list_test.c
U src/external/bsd/atf/dist/atf-c/detail/map_test.c
U src/external/bsd/atf/dist/atf-c/detail/test_helpers_test.c
U
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Sun Nov 7 17:45:22 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-c: tc.c
src/external/bsd/atf/dist/atf-c++: tests.cpp tests.hpp
src/external/bsd/atf/dist/atf-run: atf-run.cpp io_test.cpp
test-program.cpp
Log Message:
Help merge of atf-0.12.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/dist/atf-c/tc.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/atf-c++/tests.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c++/tests.hpp
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/atf-run/atf-run.cpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-run/io_test.cpp
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/atf-run/test-program.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/tc.c
diff -u src/external/bsd/atf/dist/atf-c/tc.c:1.7 src/external/bsd/atf/dist/atf-c/tc.c:1.8
--- src/external/bsd/atf/dist/atf-c/tc.c:1.7 Wed Oct 20 09:17:22 2010
+++ src/external/bsd/atf/dist/atf-c/tc.c Sun Nov 7 17:45:21 2010
@@ -642,6 +642,70 @@
return val;
}
+bool
+atf_tc_get_config_var_as_bool(const atf_tc_t *tc, const char *name)
+{
+bool val;
+const char *strval;
+atf_error_t err;
+
+strval = atf_tc_get_config_var(tc, name);
+err = atf_text_to_bool(strval, val);
+if (atf_is_error(err)) {
+atf_error_free(err);
+atf_tc_fail(Configuration variable %s does not have a valid
+boolean value; found %s, name, strval);
+}
+
+return val;
+}
+
+bool
+atf_tc_get_config_var_as_bool_wd(const atf_tc_t *tc, const char *name,
+ const bool defval)
+{
+bool val;
+
+if (!atf_tc_has_config_var(tc, name))
+val = defval;
+else
+val = atf_tc_get_config_var_as_bool(tc, name);
+
+return val;
+}
+
+long
+atf_tc_get_config_var_as_long(const atf_tc_t *tc, const char *name)
+{
+long val;
+const char *strval;
+atf_error_t err;
+
+strval = atf_tc_get_config_var(tc, name);
+err = atf_text_to_long(strval, val);
+if (atf_is_error(err)) {
+atf_error_free(err);
+atf_tc_fail(Configuration variable %s does not have a valid
+long value; found %s, name, strval);
+}
+
+return val;
+}
+
+long
+atf_tc_get_config_var_as_long_wd(const atf_tc_t *tc, const char *name,
+ const long defval)
+{
+long val;
+
+if (!atf_tc_has_config_var(tc, name))
+val = defval;
+else
+val = atf_tc_get_config_var_as_long(tc, name);
+
+return val;
+}
+
const char *
atf_tc_get_md_var(const atf_tc_t *tc, const char *name)
{
Index: src/external/bsd/atf/dist/atf-c++/tests.cpp
diff -u src/external/bsd/atf/dist/atf-c++/tests.cpp:1.5 src/external/bsd/atf/dist/atf-c++/tests.cpp:1.6
--- src/external/bsd/atf/dist/atf-c++/tests.cpp:1.5 Wed Oct 20 09:17:23 2010
+++ src/external/bsd/atf/dist/atf-c++/tests.cpp Sun Nov 7 17:45:22 2010
@@ -111,6 +111,16 @@
}
//
+// Free helper functions.
+//
+
+bool
+detail::match(const std::string regexp, const std::string str)
+{
+return atf::text::match(str, regexp);
+}
+
+//
// The tc class.
//
Index: src/external/bsd/atf/dist/atf-c++/tests.hpp
diff -u src/external/bsd/atf/dist/atf-c++/tests.hpp:1.4 src/external/bsd/atf/dist/atf-c++/tests.hpp:1.5
--- src/external/bsd/atf/dist/atf-c++/tests.hpp:1.4 Wed Oct 20 09:17:23 2010
+++ src/external/bsd/atf/dist/atf-c++/tests.hpp Sun Nov 7 17:45:22 2010
@@ -34,6 +34,10 @@
#include memory
#include string
+extern C {
+#include atf-c/defs.h
+}
+
#include atf-c++/utils.hpp
namespace atf {
@@ -54,6 +58,8 @@
void tc_meta_data(const std::string, const std::string);
};
+bool match(const std::string, const std::string);
+
} // namespace
//
@@ -99,10 +105,10 @@
void run_cleanup(void) const;
// To be called from the child process only.
-static void pass(void);
-static void fail(const std::string);
+static void pass(void) ATF_DEFS_ATTRIBUTE_NORETURN;
+static void fail(const std::string) ATF_DEFS_ATTRIBUTE_NORETURN;
static void fail_nonfatal(const std::string);
-static void skip(const std::string);
+static void skip(const std::string) ATF_DEFS_ATTRIBUTE_NORETURN;
static void check_errno(const char*, const int, const int, const char*,
const bool);
static void require_errno(const char*, const int, const int, const char*,
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sun Nov 7 17:46:46 UTC 2010
Modified Files:
src/external/bsd/atf/etc/atf: Makefile NetBSD.conf
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-run: Makefile
Added Files:
src/external/bsd/atf/etc/atf: common.conf
Log Message:
Adjust reachover build files after import of atf-0.12.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/etc/atf/Makefile \
src/external/bsd/atf/etc/atf/NetBSD.conf
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/etc/atf/common.conf
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-run/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/etc/atf/Makefile
diff -u src/external/bsd/atf/etc/atf/Makefile:1.2 src/external/bsd/atf/etc/atf/Makefile:1.3
--- src/external/bsd/atf/etc/atf/Makefile:1.2 Fri Jun 4 08:33:40 2010
+++ src/external/bsd/atf/etc/atf/Makefile Sun Nov 7 17:46:45 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/07 17:46:45 jmmv Exp $
.include bsd.own.mk
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-run/sample
-CONFIGFILES= NetBSD.conf atf-run.hooks
+CONFIGFILES= NetBSD.conf atf-run.hooks common.conf
FILESDIR= /etc/atf
FILESMODE= 644
Index: src/external/bsd/atf/etc/atf/NetBSD.conf
diff -u src/external/bsd/atf/etc/atf/NetBSD.conf:1.2 src/external/bsd/atf/etc/atf/NetBSD.conf:1.3
--- src/external/bsd/atf/etc/atf/NetBSD.conf:1.2 Sat Jun 26 11:27:50 2010
+++ src/external/bsd/atf/etc/atf/NetBSD.conf Sun Nov 7 17:46:45 2010
@@ -7,8 +7,5 @@
# details on the NetBSD test suite.
#
-# When running the test suite as root, some tests require to switch to
-# an unprivileged user to perform extra checks. Set this variable to
-# the user you want to use in those cases. If not set, those tests will
-# be skipped.
-#unprivileged-user = nobody
+#variable1 = value1
+#variable2 = value2
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.7 src/external/bsd/atf/lib/libatf-c/Makefile:1.8
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.7 Wed Oct 20 09:20:09 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Nov 7 17:46:46 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/10/20 09:20:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2010/11/07 17:46:46 jmmv Exp $
NOLINT= # defined
@@ -84,7 +84,7 @@
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.11,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.12,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.6 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.7
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.6 Wed Oct 20 09:20:09 2010
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Sun Nov 7 17:46:46 2010
@@ -1,15 +1,6 @@
/* bconfig.h. Generated from bconfig.h.in by configure. */
/* bconfig.h.in. Generated from configure.ac by autoheader. */
-/* Define to the path of chattr(1) if you have it */
-/* #undef CHATTR */
-
-/* Define to 1 if you have chattr(1) */
-/* #undef HAVE_CHATTR */
-
-/* Define to 1 if you have the `chflags' function. */
-#define HAVE_CHFLAGS 1
-
/* Define to 1 if basename takes a constant pointer */
/* #undef HAVE_CONST_BASENAME */
@@ -105,7 +96,7 @@
#define PACKAGE_NAME Automated Testing Framework
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING Automated Testing Framework 0.11
+#define PACKAGE_STRING Automated Testing Framework 0.12
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME atf
@@ -114,10 +105,10 @@
#define PACKAGE_URL http://www.NetBSD.org/~jmmv/atf/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 0.11
+#define PACKAGE_VERSION 0.12
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 0.11
+#define VERSION 0.12
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.5 src/external/bsd/atf/lib/libatf-c++/Makefile:1.6
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.5 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Nov 7 17:46:46 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/07
CVS commit: src/external/bsd/atf/dist/atf-run
Module Name:src
Committed By: jmmv
Date: Sun Nov 7 17:54:03 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-run: config_test.cpp integration_test.sh
Log Message:
Pull in post-release fix 3d5597b0076ade841abf03fc274da72d17cb3ad6 to resolve
issues with the default NetBSD settings. Tests were producing invalid results
because they were unexpectedly reading the system-wide settings.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/atf/dist/atf-run/config_test.cpp
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-run/integration_test.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-run/config_test.cpp
diff -u src/external/bsd/atf/dist/atf-run/config_test.cpp:1.1.1.2 src/external/bsd/atf/dist/atf-run/config_test.cpp:1.2
--- src/external/bsd/atf/dist/atf-run/config_test.cpp:1.1.1.2 Wed Oct 20 09:14:23 2010
+++ src/external/bsd/atf/dist/atf-run/config_test.cpp Sun Nov 7 17:54:03 2010
@@ -27,7 +27,9 @@
// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
+#include atf-c++/detail/env.hpp
#include atf-c++/detail/test_helpers.hpp
+#include atf-c++/config.hpp
#include atf-c++/macros.hpp
#include config.hpp
@@ -37,6 +39,14 @@
using atf::tests::vars_map;
+namespace atf {
+namespace config {
+
+void __reinit(void);
+
+} // namespace config
+} // namespace atf
+
// -
// Tests for the config parser.
// -
@@ -351,6 +361,8 @@
ATF_TEST_CASE(read_config_files_none);
ATF_TEST_CASE_HEAD(read_config_files_none) {}
ATF_TEST_CASE_BODY(read_config_files_none) {
+atf::env::set(ATF_CONFDIR, .);
+atf::config::__reinit();
ATF_REQUIRE(vars_map() == impl::read_config_files(test-suite));
}
Index: src/external/bsd/atf/dist/atf-run/integration_test.sh
diff -u src/external/bsd/atf/dist/atf-run/integration_test.sh:1.1.1.3 src/external/bsd/atf/dist/atf-run/integration_test.sh:1.2
--- src/external/bsd/atf/dist/atf-run/integration_test.sh:1.1.1.3 Sun Nov 7 17:43:28 2010
+++ src/external/bsd/atf/dist/atf-run/integration_test.sh Sun Nov 7 17:54:03 2010
@@ -29,6 +29,8 @@
create_atffile()
{
+ATF_CONFDIR=$(pwd); export ATF_CONFDIR
+
cat Atffile EOF
Content-Type: application/X-atf-atffile; version=1
CVS commit: src/external/bsd/atf/share/doc/atf
Module Name:src
Committed By: njoly
Date: Tue Nov 2 14:41:32 UTC 2010
Modified Files:
src/external/bsd/atf/share/doc/atf: Makefile
Log Message:
Do substitute __TESTSDIR__ when generating atf(7) man page.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/share/doc/atf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/share/doc/atf/Makefile
diff -u src/external/bsd/atf/share/doc/atf/Makefile:1.3 src/external/bsd/atf/share/doc/atf/Makefile:1.4
--- src/external/bsd/atf/share/doc/atf/Makefile:1.3 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/share/doc/atf/Makefile Tue Nov 2 14:41:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/11/02 14:41:32 njoly Exp $
.include bsd.own.mk
@@ -18,7 +18,9 @@
CLEANFILES+= atf.7 atf.7.tmp
atf.7: atf.7.in
- ${TOOL_SED} -e 's,__DOCDIR__,/usr/share/doc/atf,g' \
+ ${TOOL_SED} \
+ -e 's,__DOCDIR__,/usr/share/doc/atf,g' \
+ -e 's,__TESTSDIR__,/usr/tests,g' \
${SRCDIR}/doc/atf.7.in atf.7.tmp
mv atf.7.tmp atf.7
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Wed Oct 20 09:14:32 UTC 2010 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19089 Log Message: Import atf-0.11: Experimental version released on October 20th, 2010. * The ATF_CHECK* macros in atf-c++ were renamed to ATF_REQUIRE* to match their counterparts in atf-c. * Clearly separated the modules in atf-c that are supposed to be public from those that are implementation details. The header files for the internal modules are not installed any more. * Made the atf-check tool private. It is only required by atf-sh and being public has the danger of causing confusion. Also, making it private simplifies the public API of atf. * Changed atf-sh to enable per-command error checking (set -e) by default. This catches many cases in which a test case is broken but it is not reported as such because execution continues. * Fixed the XSTL and CSS stylesheets to support expected failures. Status: Vendor Tag: TNF Release Tags: atf-0-11 U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/Atffile U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tp.h N src/external/bsd/atf/dist/atf-c/utils.h U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh U src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c U src/external/bsd/atf/dist/atf-c/error.c C src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tp.c N src/external/bsd/atf/dist/atf-c/utils.c U src/external/bsd/atf/dist/atf-c/h_build.h U src/external/bsd/atf/dist/atf-c/atf_c_test.c U src/external/bsd/atf/dist/atf-c/build_test.c U src/external/bsd/atf/dist/atf-c/check_test.c U src/external/bsd/atf/dist/atf-c/config_test.c U src/external/bsd/atf/dist/atf-c/tc_test.c U src/external/bsd/atf/dist/atf-c/error_test.c U src/external/bsd/atf/dist/atf-c/macros_test.c U src/external/bsd/atf/dist/atf-c/tp_test.c N src/external/bsd/atf/dist/atf-c/utils_test.c U src/external/bsd/atf/dist/atf-c/atf-c.pc.in U src/external/bsd/atf/dist/atf-c/Atffile U src/external/bsd/atf/dist/atf-c/macros_h_test.c N src/external/bsd/atf/dist/atf-c/detail/process_helpers.c N src/external/bsd/atf/dist/atf-c/detail/test_helpers.c N src/external/bsd/atf/dist/atf-c/detail/test_helpers.h N src/external/bsd/atf/dist/atf-c/detail/dynstr.c N src/external/bsd/atf/dist/atf-c/detail/dynstr.h N src/external/bsd/atf/dist/atf-c/detail/env.c N src/external/bsd/atf/dist/atf-c/detail/env.h N src/external/bsd/atf/dist/atf-c/detail/fs.c N src/external/bsd/atf/dist/atf-c/detail/fs.h N src/external/bsd/atf/dist/atf-c/detail/list.c N src/external/bsd/atf/dist/atf-c/detail/list.h N src/external/bsd/atf/dist/atf-c/detail/map.c N src/external/bsd/atf/dist/atf-c/detail/map.h N src/external/bsd/atf/dist/atf-c/detail/process.c N src/external/bsd/atf/dist/atf-c/detail/process.h N src/external/bsd/atf/dist/atf-c/detail/sanity.c N src/external/bsd/atf/dist/atf-c/detail/sanity.h N src/external/bsd/atf/dist/atf-c/detail/text.c N src/external/bsd/atf/dist/atf-c/detail/text.h N src/external/bsd/atf/dist/atf-c/detail/tp_main.c N src/external/bsd/atf/dist/atf-c/detail/user.c N src/external/bsd/atf/dist/atf-c/detail/user.h N src/external/bsd/atf/dist/atf-c/detail/dynstr_test.c N src/external/bsd/atf/dist/atf-c/detail/env_test.c N src/external/bsd/atf/dist/atf-c/detail/fs_test.c N src/external/bsd/atf/dist/atf-c/detail/list_test.c N src/external/bsd/atf/dist/atf-c/detail/map_test.c N src/external/bsd/atf/dist/atf-c/detail/test_helpers_test.c N src/external/bsd/atf/dist/atf-c/detail/process_test.c N src/external/bsd/atf/dist/atf-c/detail/sanity_test.c N src/external/bsd/atf/dist/atf-c/detail/text_test.c N src/external/bsd/atf/dist/atf-c/detail/user_test.c N src/external/bsd/atf/dist/atf-c/detail/Atffile U src/external/bsd/atf/dist/atf-c++/atf-c++-api.3 U src/external/bsd/atf/dist/atf-c++/build.hpp U src/external/bsd/atf/dist/atf-c++/check.hpp U src/external/bsd/atf/dist/atf-c++/config.hpp U src/external/bsd/atf/dist/atf-c++/macros.hpp C src/external/bsd/atf/dist/atf-c++/tests.hpp U src/external/bsd/atf/dist/atf-c++/utils.hpp U src/external/bsd/atf/dist/atf-c++/macros_hpp_test.cpp U src/external/bsd/atf/dist/atf-c++/build.cpp U src/external/bsd/atf/dist/atf-c++/check.cpp U src/external/bsd/atf/dist/atf-c++/config.cpp C src/external/bsd/atf/dist/atf-c++/tests.cpp
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Wed Oct 20 09:17:24 UTC 2010 Modified Files: src/external/bsd/atf/dist/atf-c: tc.c src/external/bsd/atf/dist/atf-c++: tests.cpp tests.hpp src/external/bsd/atf/dist/atf-report: atf-report.cpp tests-results.css tests-results.xsl src/external/bsd/atf/dist/atf-run: atf-run.cpp test-program.cpp test-program.hpp src/external/bsd/atf/dist/atf-version: atf-version.cpp Removed Files: src/external/bsd/atf/dist/atf-c: dynstr.c dynstr.h dynstr_test.c env.c env.h env_test.c fs.c fs.h fs_test.c list.c list.h list_test.c map.c map.h map_test.c process.c process.h process_helpers.c process_test.c sanity.c sanity.h sanity_test.c test_helpers.c test_helpers.h test_helpers_test.c text.c text.h text_test.c tp_main.c user.c user.h user_test.c src/external/bsd/atf/dist/atf-c++: application.cpp application.hpp application_test.cpp env.cpp env.hpp env_test.cpp exceptions.cpp exceptions.hpp exceptions_test.cpp expand.cpp expand.hpp expand_test.cpp fs.cpp fs.hpp fs_test.cpp io.cpp io.hpp io_test.cpp parser.cpp parser.hpp parser_test.cpp process.cpp process.hpp process_test.cpp sanity.hpp sanity_test.cpp signals.cpp signals.hpp signals_test.cpp test_helpers.cpp test_helpers.hpp text.cpp text.hpp text_test.cpp ui.cpp ui.hpp ui_test.cpp user.cpp user.hpp user_test.cpp src/external/bsd/atf/dist/atf-check: Atffile atf-check.1 atf-check.cpp integration_test.sh Log Message: Resolve import conflicts. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/external/bsd/atf/dist/atf-c/dynstr.c cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/dynstr.h \ src/external/bsd/atf/dist/atf-c/text.c \ src/external/bsd/atf/dist/atf-c/text.h cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-c/dynstr_test.c \ src/external/bsd/atf/dist/atf-c/env.c \ src/external/bsd/atf/dist/atf-c/env.h \ src/external/bsd/atf/dist/atf-c/env_test.c \ src/external/bsd/atf/dist/atf-c/fs_test.c \ src/external/bsd/atf/dist/atf-c/list_test.c \ src/external/bsd/atf/dist/atf-c/map_test.c \ src/external/bsd/atf/dist/atf-c/process_helpers.c \ src/external/bsd/atf/dist/atf-c/process_test.c \ src/external/bsd/atf/dist/atf-c/sanity.c \ src/external/bsd/atf/dist/atf-c/sanity.h \ src/external/bsd/atf/dist/atf-c/sanity_test.c \ src/external/bsd/atf/dist/atf-c/test_helpers.c \ src/external/bsd/atf/dist/atf-c/test_helpers.h \ src/external/bsd/atf/dist/atf-c/test_helpers_test.c \ src/external/bsd/atf/dist/atf-c/text_test.c \ src/external/bsd/atf/dist/atf-c/user.c \ src/external/bsd/atf/dist/atf-c/user.h \ src/external/bsd/atf/dist/atf-c/user_test.c cvs rdiff -u -r1.5 -r0 src/external/bsd/atf/dist/atf-c/fs.c cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/atf/dist/atf-c/fs.h \ src/external/bsd/atf/dist/atf-c/map.c cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/atf-c/list.c \ src/external/bsd/atf/dist/atf-c/list.h \ src/external/bsd/atf/dist/atf-c/map.h \ src/external/bsd/atf/dist/atf-c/process.c \ src/external/bsd/atf/dist/atf-c/process.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/atf-c/tc.c cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/atf/dist/atf-c/tp_main.c cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/atf/dist/atf-c++/application.cpp \ src/external/bsd/atf/dist/atf-c++/application.hpp \ src/external/bsd/atf/dist/atf-c++/fs.cpp \ src/external/bsd/atf/dist/atf-c++/fs.hpp \ src/external/bsd/atf/dist/atf-c++/process.hpp cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/atf-c++/application_test.cpp \ src/external/bsd/atf/dist/atf-c++/env.cpp \ src/external/bsd/atf/dist/atf-c++/env.hpp \ src/external/bsd/atf/dist/atf-c++/env_test.cpp \ src/external/bsd/atf/dist/atf-c++/exceptions.hpp \ src/external/bsd/atf/dist/atf-c++/exceptions_test.cpp \ src/external/bsd/atf/dist/atf-c++/expand_test.cpp \ src/external/bsd/atf/dist/atf-c++/fs_test.cpp \ src/external/bsd/atf/dist/atf-c++/parser_test.cpp \ src/external/bsd/atf/dist/atf-c++/process_test.cpp \ src/external/bsd/atf/dist/atf-c++/sanity.hpp \ src/external/bsd/atf/dist/atf-c++/sanity_test.cpp \ src/external/bsd/atf/dist/atf-c++/signals_test.cpp \ src/external/bsd/atf/dist/atf-c++/test_helpers.cpp \ src/external/bsd/atf/dist/atf-c++/test_helpers.hpp \ src/external/bsd/atf/dist/atf-c++/text_test.cpp \ src/external/bsd/atf/dist/atf-c++/ui.hpp \ src/external/bsd/atf/dist/atf-c++/ui_test.cpp \ src/external/bsd/atf/dist/atf-c++/user.cpp \ src/external/bsd/atf/dist/atf-c++/user.hpp \ src/external/bsd/atf/dist/atf-c++/user_test.cpp cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c++/exceptions.cpp \
