From 8fee91db34c6746951ced9a348b36c5b758d576e Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Fri, 14 Feb 2014 14:41:25 +0000 Subject: [PATCH 1/2] Import atf-0.19: Experimental version released on February 7th, 2014. This is the last release to bundle the code for the deprecated tools. The next release will drop their code and will stop worrying about backwards compatibility between the ATF libraries and what the old tools may or may not support. If you still require the old tools for some reason, grab a copy of the 'tools' directory now. The code in this directory is standalone and does not depend on any internal details of atf-c++ any longer. * Various fixes and improvements to support running as part of the FreeBSD test suite. * Project hosting moved from Google Code (as a subproject of Kyua) to GitHub (as a first-class project). The main reason for the change is the suppression of binary downloads in Google Code on Jan 15th, 2014. See https://github.com/jmmv/atf/ * Removed builtin help from atf-sh(1) and atf-check(1) for simplicity reasons. In other words, their -h option is gone. * Moved the code of the deprecated tools into a 'tools' directory and completely decoupled their code from the internals of atf-c++. The reason for this is to painlessly allow a third-party to maintain a copy of these tools after we delete them because upcoming changes to atf-c++ would break the stale tools. --- Atffile | 4 +- Kyuafile | 10 +- Makefile.am | 10 +- Makefile.in | 3176 +++++++++-------- NEWS | 32 + aclocal.m4 | 61 +- admin/ar-lib | 270 ++ admin/check-style.sh | 3 +- atf-c++/Makefile.am.inc | 4 +- atf-c++/check.hpp | 8 +- atf-c++/check_test.cpp | 4 +- atf-c++/config.cpp | 4 - atf-c++/config_test.cpp | 4 - atf-c++/detail/Atffile | 3 - atf-c++/detail/Kyuafile | 4 +- atf-c++/detail/Makefile.am.inc | 21 +- atf-c++/detail/application.cpp | 115 +- atf-c++/detail/application.hpp | 8 +- atf-c++/detail/application_test.cpp | 2 +- atf-c++/detail/exceptions.hpp | 41 - atf-c++/detail/process_test.cpp | 4 +- atf-c++/detail/test_helpers.cpp | 82 +- atf-c++/detail/test_helpers.hpp | 63 +- atf-c++/detail/version_helper.cpp | 41 + atf-c++/macros_test.cpp | 29 +- atf-c++/pkg_config_test.sh | 8 +- atf-c++/tests.cpp | 19 +- atf-c++/tests.hpp | 8 +- atf-c++/tests_test.cpp | 2 +- atf-c/Makefile.am.inc | 12 +- atf-c/config.c | 4 - atf-c/config_test.c | 4 - atf-c/detail/Makefile.am.inc | 3 + atf-c/detail/test_helpers.c | 20 +- atf-c/detail/test_helpers.h | 17 +- atf-c/detail/version_helper.c | 43 + atf-c/macros_test.c | 29 +- atf-c/pkg_config_test.sh | 8 +- atf-config/Atffile | 5 - atf-config/Kyuafile | 5 - atf-config/Makefile.am.inc | 48 - atf-report/Atffile | 5 - atf-report/Kyuafile | 6 - atf-report/Makefile.am.inc | 80 - atf-run/Atffile | 5 - atf-run/Kyuafile | 13 - atf-run/Makefile.am.inc | 150 - atf-run/fs.cpp | 265 -- atf-run/fs_test.cpp | 260 -- atf-sh/atf-check.cpp | 2 +- atf-sh/atf-sh.cpp | 2 +- atf-sh/integration_test.sh | 2 +- atf-version/Makefile.am.inc | 54 - bconfig.h.in | 15 - bootstrap/Makefile.am.inc | 4 +- bootstrap/h_app_empty.cpp | 4 +- bootstrap/h_app_opts_args.cpp | 9 +- bootstrap/package.m4 | 4 +- bootstrap/testsuite | 2487 ++++++++++++- bootstrap/testsuite.at | 2 +- configure | 542 +-- configure.ac | 8 +- doc/Makefile.am.inc | 17 - doc/atf-test-case.4 | 5 +- m4/cxx-std-funcs.m4 | 29 - m4/module-env.m4 | 4 - m4/module-fs.m4 | 2 - m4/module-sanity.m4 | 32 - tools/Atffile | 25 + tools/Kyuafile | 24 + tools/Makefile.am.inc | 332 ++ tools/application.cpp | 317 ++ tools/application.hpp | 113 + tools/application_test.cpp | 94 + {atf-config => tools}/atf-config.1 | 0 {atf-config => tools}/atf-config.cpp | 23 +- .../atf-config_test.sh | 0 {doc => tools}/atf-formats.5 | 0 {atf-report => tools}/atf-report.1 | 0 {atf-report => tools}/atf-report.cpp | 69 +- .../atf-report_test.sh | 3 +- {atf-run => tools}/atf-run.1 | 0 {atf-run => tools}/atf-run.cpp | 232 +- .../atf-run_test.sh | 0 {atf-version => tools}/atf-version.1 | 0 {atf-version => tools}/atf-version.cpp | 11 +- {doc => tools}/atf.7.in | 0 {atf-run => tools}/atffile.cpp | 101 +- {atf-run => tools}/atffile.hpp | 31 +- {atf-run => tools}/atffile_test.cpp | 34 +- tools/auto_array.hpp | 179 + tools/auto_array_test.cpp | 303 ++ {atf-run => tools}/bad_metadata_helper.c | 0 tools/config.cpp | 135 + tools/config.hpp | 75 + atf-run/config.cpp => tools/config_file.cpp | 89 +- atf-run/config.hpp => tools/config_file.hpp | 23 +- .../config_file_test.cpp | 20 +- tools/config_test.cpp | 221 ++ .../pass_helper.cpp => tools/defs.hpp.in | 21 +- tools/env.cpp | 102 + tools/env.hpp | 84 + .../misc_helpers.cpp => tools/env_test.cpp | 67 +- .../noncopyable.hpp => tools/exceptions.cpp | 54 +- atf-run/fs.hpp => tools/exceptions.hpp | 72 +- {atf-c++/detail => tools}/expand.cpp | 6 +- {atf-c++/detail => tools}/expand.hpp | 10 +- {atf-c++/detail => tools}/expand_test.cpp | 14 +- {atf-run => tools}/expect_helpers.c | 0 {atf-report => tools}/fail_helper.cpp | 2 +- tools/fs.cpp | 744 ++++ tools/fs.hpp | 377 ++ tools/fs_test.cpp | 743 ++++ {atf-version => tools}/generate-revision.sh | 0 {atf-run => tools}/io.cpp | 59 +- {atf-run => tools}/io.hpp | 38 +- {atf-run => tools}/io_test.cpp | 30 +- {atf-run => tools}/misc_helpers.cpp | 67 +- {atf-c++/detail => tools}/parser.cpp | 20 +- {atf-c++/detail => tools}/parser.hpp | 10 +- {atf-c++/detail => tools}/parser_test.cpp | 72 +- {atf-run => tools}/pass_helper.cpp | 2 +- tools/process.cpp | 492 +++ tools/process.hpp | 324 ++ tools/process_helpers.c | 117 + tools/process_test.cpp | 360 ++ {atf-report => tools}/reader.cpp | 116 +- {atf-report => tools}/reader.hpp | 12 +- {atf-report => tools}/reader_test.cpp | 16 +- {atf-run => tools}/requirements.cpp | 97 +- {atf-run => tools}/requirements.hpp | 21 +- {atf-run => tools}/requirements_test.cpp | 92 +- {atf-run => tools}/sample/atf-run.hooks | 0 {atf-run => tools}/sample/common.conf | 0 {atf-run => tools}/several_tcs_helper.c | 0 {atf-run => tools}/share/atf-run.hooks | 0 {atf-run => tools}/signals.cpp | 13 +- {atf-run => tools}/signals.hpp | 14 +- {atf-run => tools}/signals_test.cpp | 32 +- {atf-run => tools}/test-program.cpp | 226 +- {atf-run => tools}/test-program.hpp | 37 +- tools/test_helpers.hpp | 116 + {atf-run => tools}/test_program_test.cpp | 55 +- {atf-report => tools}/tests-results.css | 0 {atf-report => tools}/tests-results.dtd | 0 {atf-report => tools}/tests-results.xsl | 0 tools/text.cpp | 158 + tools/text.hpp | 153 + tools/text_test.cpp | 390 ++ atf-run/timer.cpp => tools/timers.cpp | 40 +- atf-run/timer.hpp => tools/timers.hpp | 22 +- {atf-c++/detail => tools}/ui.cpp | 23 +- {atf-c++/detail => tools}/ui.hpp | 10 +- {atf-c++/detail => tools}/ui_test.cpp | 6 +- {atf-run => tools}/user.cpp | 33 +- {atf-run => tools}/user.hpp | 14 +- {atf-run => tools}/user_test.cpp | 10 +- {atf-run => tools}/zero_tcs_helper.c | 0 158 files changed, 12107 insertions(+), 4186 deletions(-) create mode 100755 admin/ar-lib create mode 100644 atf-c++/detail/version_helper.cpp create mode 100644 atf-c/detail/version_helper.c delete mode 100644 atf-config/Atffile delete mode 100644 atf-config/Kyuafile delete mode 100644 atf-config/Makefile.am.inc delete mode 100644 atf-report/Atffile delete mode 100644 atf-report/Kyuafile delete mode 100644 atf-report/Makefile.am.inc delete mode 100644 atf-run/Atffile delete mode 100644 atf-run/Kyuafile delete mode 100644 atf-run/Makefile.am.inc delete mode 100644 atf-run/fs.cpp delete mode 100644 atf-run/fs_test.cpp delete mode 100644 atf-version/Makefile.am.inc delete mode 100644 m4/module-sanity.m4 create mode 100644 tools/Atffile create mode 100644 tools/Kyuafile create mode 100644 tools/Makefile.am.inc create mode 100644 tools/application.cpp create mode 100644 tools/application.hpp create mode 100644 tools/application_test.cpp rename {atf-config => tools}/atf-config.1 (100%) rename {atf-config => tools}/atf-config.cpp (88%) rename atf-config/integration_test.sh => tools/atf-config_test.sh (100%) mode change 100644 => 100755 rename {doc => tools}/atf-formats.5 (100%) rename {atf-report => tools}/atf-report.1 (100%) rename {atf-report => tools}/atf-report.cpp (93%) rename atf-report/integration_test.sh => tools/atf-report_test.sh (99%) mode change 100644 => 100755 rename {atf-run => tools}/atf-run.1 (100%) rename {atf-run => tools}/atf-run.cpp (67%) rename atf-run/integration_test.sh => tools/atf-run_test.sh (100%) mode change 100644 => 100755 rename {atf-version => tools}/atf-version.1 (100%) rename {atf-version => tools}/atf-version.cpp (93%) rename {doc => tools}/atf.7.in (100%) rename {atf-run => tools}/atffile.cpp (79%) rename {atf-run => tools}/atffile.hpp (82%) rename {atf-run => tools}/atffile_test.cpp (95%) create mode 100644 tools/auto_array.hpp create mode 100644 tools/auto_array_test.cpp rename {atf-run => tools}/bad_metadata_helper.c (100%) create mode 100644 tools/config.cpp create mode 100644 tools/config.hpp rename atf-run/config.cpp => tools/config_file.cpp (69%) rename atf-run/config.hpp => tools/config_file.hpp (80%) rename atf-run/config_test.cpp => tools/config_file_test.cpp (96%) create mode 100644 tools/config_test.cpp rename atf-report/pass_helper.cpp => tools/defs.hpp.in (81%) create mode 100644 tools/env.cpp create mode 100644 tools/env.hpp rename atf-report/misc_helpers.cpp => tools/env_test.cpp (57%) rename atf-c++/noncopyable.hpp => tools/exceptions.cpp (65%) rename atf-run/fs.hpp => tools/exceptions.hpp (55%) rename {atf-c++/detail => tools}/expand.cpp (95%) rename {atf-c++/detail => tools}/expand.hpp (95%) rename {atf-c++/detail => tools}/expand_test.cpp (97%) rename {atf-run => tools}/expect_helpers.c (100%) rename {atf-report => tools}/fail_helper.cpp (98%) create mode 100644 tools/fs.cpp create mode 100644 tools/fs.hpp create mode 100644 tools/fs_test.cpp rename {atf-version => tools}/generate-revision.sh (100%) rename {atf-run => tools}/io.cpp (87%) rename {atf-run => tools}/io.hpp (96%) rename {atf-run => tools}/io_test.cpp (95%) rename {atf-run => tools}/misc_helpers.cpp (86%) rename {atf-c++/detail => tools}/parser.cpp (95%) rename {atf-c++/detail => tools}/parser.hpp (99%) rename {atf-c++/detail => tools}/parser_test.cpp (93%) rename {atf-run => tools}/pass_helper.cpp (98%) create mode 100644 tools/process.cpp create mode 100644 tools/process.hpp create mode 100644 tools/process_helpers.c create mode 100644 tools/process_test.cpp rename {atf-report => tools}/reader.cpp (78%) rename {atf-report => tools}/reader.hpp (93%) rename {atf-report => tools}/reader_test.cpp (98%) rename {atf-run => tools}/requirements.cpp (75%) rename {atf-run => tools}/requirements.hpp (76%) rename {atf-run => tools}/requirements_test.cpp (87%) rename {atf-run => tools}/sample/atf-run.hooks (100%) rename {atf-run => tools}/sample/common.conf (100%) rename {atf-run => tools}/several_tcs_helper.c (100%) rename {atf-run => tools}/share/atf-run.hooks (100%) rename {atf-run => tools}/signals.cpp (93%) rename {atf-run => tools}/signals.hpp (93%) rename {atf-run => tools}/signals_test.cpp (91%) rename {atf-run => tools}/test-program.cpp (78%) rename {atf-run => tools}/test-program.hpp (80%) create mode 100644 tools/test_helpers.hpp rename {atf-run => tools}/test_program_test.cpp (95%) rename {atf-report => tools}/tests-results.css (100%) rename {atf-report => tools}/tests-results.dtd (100%) rename {atf-report => tools}/tests-results.xsl (100%) create mode 100644 tools/text.cpp create mode 100644 tools/text.hpp create mode 100644 tools/text_test.cpp rename atf-run/timer.cpp => tools/timers.cpp (87%) rename atf-run/timer.hpp => tools/timers.hpp (89%) rename {atf-c++/detail => tools}/ui.cpp (89%) rename {atf-c++/detail => tools}/ui.hpp (96%) rename {atf-c++/detail => tools}/ui_test.cpp (98%) rename {atf-run => tools}/user.cpp (80%) rename {atf-run => tools}/user.hpp (90%) rename {atf-run => tools}/user_test.cpp (95%) rename {atf-run => tools}/zero_tcs_helper.c (100%) diff --git a/Atffile b/Atffile index 9306a6c089f4..4d7aed7756de 100644 --- a/Atffile +++ b/Atffile @@ -7,6 +7,4 @@ tp: atf-c++ tp: atf-sh tp: test-programs -tp-glob: atf-config* -tp-glob: atf-report* -tp-glob: atf-run* +tp-glob: tools* diff --git a/Kyuafile b/Kyuafile index 54084cd9bb8d..77125974a406 100644 --- a/Kyuafile +++ b/Kyuafile @@ -7,12 +7,6 @@ include("atf-c++/Kyuafile") include("atf-sh/Kyuafile") include("test-programs/Kyuafile") -if fs.exists("atf-config/Kyuafile") then - include("atf-config/Kyuafile") -end -if fs.exists("atf-report/Kyuafile") then - include("atf-report/Kyuafile") -end -if fs.exists("atf-run/Kyuafile") then - include("atf-run/Kyuafile") +if fs.exists("tools/Kyuafile") then + include("tools/Kyuafile") end diff --git a/Makefile.am b/Makefile.am index d5cee966eb97..f90fc9949fd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,7 @@ atf_aclocal_DATA = BUILT_SOURCES = CLEANFILES = +DIST_HOOKS = EXTRA_DIST = bin_PROGRAMS = dist_man_MANS = @@ -54,10 +55,7 @@ include doc/Makefile.am.inc include test-programs/Makefile.am.inc if ENABLE_TOOLS -include atf-report/Makefile.am.inc -include atf-config/Makefile.am.inc -include atf-run/Makefile.am.inc -include atf-version/Makefile.am.inc +include tools/Makefile.am.inc endif # @@ -126,7 +124,7 @@ BUILD_SH_TP = \ # Custom targets. # -dist-hook: forbid-dist +DIST_HOOKS += forbid-dist if ENABLE_TOOLS forbid-dist: @true @@ -151,4 +149,6 @@ release-test: .PHONY: $(PHONY_TARGETS) +dist-hook: $(DIST_HOOKS) + # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/Makefile.in b/Makefile.in index 9c86107eb462..a98fc3570567 100644 --- a/Makefile.in +++ b/Makefile.in @@ -333,92 +333,6 @@ # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# @@ -500,17 +414,15 @@ DIST_COMMON = $(srcdir)/admin/Makefile.am.inc \ $(srcdir)/bootstrap/Makefile.am.inc \ $(srcdir)/doc/Makefile.am.inc \ $(srcdir)/test-programs/Makefile.am.inc \ - $(srcdir)/atf-report/Makefile.am.inc \ - $(srcdir)/atf-config/Makefile.am.inc \ - $(srcdir)/atf-run/Makefile.am.inc \ - $(srcdir)/atf-version/Makefile.am.inc $(srcdir)/Makefile.in \ + $(srcdir)/tools/Makefile.am.inc $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/bconfig.h.in \ - $(top_srcdir)/atf-c/defs.h.in $(top_srcdir)/admin/depcomp \ - $(dist_man_MANS) $(atf_c_HEADERS) $(atf_c___HEADERS) \ - $(include_HEADERS) AUTHORS COPYING INSTALL NEWS README \ - admin/compile admin/config.guess admin/config.sub \ - admin/depcomp admin/install-sh admin/missing admin/ltmain.sh \ + $(top_srcdir)/atf-c/defs.h.in $(top_srcdir)/tools/defs.hpp.in \ + $(top_srcdir)/admin/depcomp $(dist_man_MANS) $(atf_c_HEADERS) \ + $(atf_c___HEADERS) $(include_HEADERS) AUTHORS COPYING INSTALL \ + NEWS README admin/ar-lib admin/compile admin/config.guess \ + admin/config.sub admin/depcomp admin/install-sh admin/missing \ + admin/ltmain.sh $(top_srcdir)/admin/ar-lib \ $(top_srcdir)/admin/compile $(top_srcdir)/admin/config.guess \ $(top_srcdir)/admin/config.sub $(top_srcdir)/admin/install-sh \ $(top_srcdir)/admin/ltmain.sh $(top_srcdir)/admin/missing @@ -526,7 +438,8 @@ tests_atf_c_detail_PROGRAMS = atf-c/detail/dynstr_test$(EXEEXT) \ atf-c/detail/process_test$(EXEEXT) \ atf-c/detail/sanity_test$(EXEEXT) \ atf-c/detail/text_test$(EXEEXT) \ - atf-c/detail/user_test$(EXEEXT) + atf-c/detail/user_test$(EXEEXT) \ + atf-c/detail/version_helper$(EXEEXT) tests_atf_c___PROGRAMS = atf-c++/atf_c++_test$(EXEEXT) \ atf-c++/build_test$(EXEEXT) atf-c++/check_test$(EXEEXT) \ atf-c++/config_test$(EXEEXT) atf-c++/macros_test$(EXEEXT) \ @@ -536,69 +449,72 @@ tests_atf_c___detail_PROGRAMS = \ atf-c++/detail/auto_array_test$(EXEEXT) \ atf-c++/detail/env_test$(EXEEXT) \ atf-c++/detail/exceptions_test$(EXEEXT) \ - atf-c++/detail/expand_test$(EXEEXT) \ atf-c++/detail/fs_test$(EXEEXT) \ - atf-c++/detail/parser_test$(EXEEXT) \ atf-c++/detail/process_test$(EXEEXT) \ atf-c++/detail/sanity_test$(EXEEXT) \ atf-c++/detail/text_test$(EXEEXT) \ - atf-c++/detail/ui_test$(EXEEXT) + atf-c++/detail/version_helper$(EXEEXT) check_PROGRAMS = bootstrap/h_app_empty$(EXEEXT) \ bootstrap/h_app_opts_args$(EXEEXT) \ bootstrap/h_tp_basic_c$(EXEEXT) \ bootstrap/h_tp_basic_cpp$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_1 = doc/atf.7 -@ENABLE_TOOLS_TRUE@am__append_2 = doc/atf.7 -@ENABLE_TOOLS_TRUE@am__append_3 = doc/atf.7.in -@ENABLE_TOOLS_TRUE@am__append_4 = doc/atf-formats.5 \ -@ENABLE_TOOLS_TRUE@ atf-report/atf-report.1 \ -@ENABLE_TOOLS_TRUE@ atf-config/atf-config.1 atf-run/atf-run.1 \ -@ENABLE_TOOLS_TRUE@ atf-version/atf-version.1 tests_test_programs_PROGRAMS = test-programs/c_helpers$(EXEEXT) \ test-programs/cpp_helpers$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_5 = atf-report/atf-report \ -@ENABLE_TOOLS_TRUE@ atf-config/atf-config atf-run/atf-run \ -@ENABLE_TOOLS_TRUE@ atf-version/atf-version -@ENABLE_TOOLS_TRUE@am__append_6 = $(css_DATA) $(dtd_DATA) $(xsl_DATA) \ -@ENABLE_TOOLS_TRUE@ $(tests_atf_report_DATA) \ -@ENABLE_TOOLS_TRUE@ atf-report/integration_test.sh \ -@ENABLE_TOOLS_TRUE@ $(tests_atf_config_DATA) \ -@ENABLE_TOOLS_TRUE@ atf-config/integration_test.sh \ -@ENABLE_TOOLS_TRUE@ $(tests_atf_run_DATA) \ -@ENABLE_TOOLS_TRUE@ atf-run/integration_test.sh $(hooks_DATA) \ -@ENABLE_TOOLS_TRUE@ $(eg_DATA) atf-version/generate-revision.sh -@ENABLE_TOOLS_TRUE@tests_atf_report_PROGRAMS = \ -@ENABLE_TOOLS_TRUE@ atf-report/fail_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/misc_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/pass_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/reader_test$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_7 = atf-report/integration_test \ -@ENABLE_TOOLS_TRUE@ atf-config/integration_test \ -@ENABLE_TOOLS_TRUE@ atf-run/integration_test \ -@ENABLE_TOOLS_TRUE@ atf-version/revision.h \ -@ENABLE_TOOLS_TRUE@ atf-version/revision.h.stamp \ -@ENABLE_TOOLS_TRUE@ installcheck.fifo installcheck.log -@ENABLE_TOOLS_TRUE@tests_atf_run_PROGRAMS = \ -@ENABLE_TOOLS_TRUE@ atf-run/atffile_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/bad_metadata_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/config_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/expect_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/fs_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/io_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/misc_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/pass_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/several_tcs_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/signals_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/test_program_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/user_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/zero_tcs_helper$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_8 = atf-version/revision.h -@ENABLE_TOOLS_TRUE@am__append_9 = atf-version/revision.h.stamp \ + +# XXX For some reason, the nodist line above does not work as expected. +# Work this problem around. +@ENABLE_TOOLS_TRUE@am__append_1 = kill-defs-hpp +@ENABLE_TOOLS_TRUE@am__append_2 = tools/atf-config tools/atf-report \ +@ENABLE_TOOLS_TRUE@ tools/atf-run tools/atf-version +@ENABLE_TOOLS_TRUE@am__append_3 = tools/atf-config.1 \ +@ENABLE_TOOLS_TRUE@ tools/atf-report.1 tools/atf-run.1 \ +@ENABLE_TOOLS_TRUE@ tools/atf-version.1 tools/atf-formats.5 +@ENABLE_TOOLS_TRUE@am__append_4 = tools/generate-revision.sh \ +@ENABLE_TOOLS_TRUE@ tools/atf.7.in $(css_DATA) $(dtd_DATA) \ +@ENABLE_TOOLS_TRUE@ $(eg_DATA) $(hooks_DATA) $(xsl_DATA) \ +@ENABLE_TOOLS_TRUE@ $(tests_tools_DATA) \ +@ENABLE_TOOLS_TRUE@ tools/atf-config_test.sh \ +@ENABLE_TOOLS_TRUE@ tools/atf-report_test.sh \ +@ENABLE_TOOLS_TRUE@ tools/atf-run_test.sh +@ENABLE_TOOLS_TRUE@am__append_5 = tools/revision.h +@ENABLE_TOOLS_TRUE@am__append_6 = tools/revision.h \ +@ENABLE_TOOLS_TRUE@ tools/revision.h.stamp tools/atf.7 \ +@ENABLE_TOOLS_TRUE@ tools/atf-config_test tools/atf-report_test \ +@ENABLE_TOOLS_TRUE@ tools/atf-run_test installcheck.fifo \ +@ENABLE_TOOLS_TRUE@ installcheck.log +@ENABLE_TOOLS_TRUE@am__append_7 = tools/revision.h.stamp \ @ENABLE_TOOLS_TRUE@ installcheck-atf -@ENABLE_TOOLS_TRUE@am__append_10 = installcheck-atf -@ENABLE_TOOLS_FALSE@@HAVE_KYUA_TRUE@am__append_11 = installcheck-kyua -@ENABLE_TOOLS_TRUE@am__append_12 = Atffile +@ENABLE_TOOLS_TRUE@am__append_8 = tools/atf.7 +@ENABLE_TOOLS_TRUE@tests_tools_PROGRAMS = \ +@ENABLE_TOOLS_TRUE@ tools/application_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/atffile_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/auto_array_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/config_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/config_file_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/env_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/expand_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/expect_helpers$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/fail_helper$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/fs_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/io_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/misc_helpers$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/parser_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/process_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/pass_helper$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/process_helpers$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/reader_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/requirements_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/several_tcs_helper$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/signals_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/test_program_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/text_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/ui_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/user_test$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper$(EXEEXT) +@ENABLE_TOOLS_TRUE@am__append_9 = installcheck-atf +@ENABLE_TOOLS_FALSE@@HAVE_KYUA_TRUE@am__append_10 = installcheck-kyua +@ENABLE_TOOLS_TRUE@am__append_11 = Atffile subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-flags.m4 \ @@ -609,7 +525,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-flags.m4 \ $(top_srcdir)/m4/module-application.m4 \ $(top_srcdir)/m4/module-defs.m4 $(top_srcdir)/m4/module-env.m4 \ $(top_srcdir)/m4/module-fs.m4 \ - $(top_srcdir)/m4/module-sanity.m4 \ $(top_srcdir)/m4/module-signals.m4 \ $(top_srcdir)/m4/runtime-tool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -618,8 +533,52 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = bconfig.h -CONFIG_CLEAN_FILES = atf-c/defs.h +CONFIG_CLEAN_FILES = atf-c/defs.h tools/defs.hpp CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +tools_libtools_a_AR = $(AR) $(ARFLAGS) +tools_libtools_a_LIBADD = +am__tools_libtools_a_SOURCES_DIST = tools/application.cpp \ + tools/application.hpp tools/atffile.cpp tools/atffile.hpp \ + tools/auto_array.hpp tools/config.cpp tools/config.hpp \ + tools/config_file.cpp tools/config_file.hpp tools/env.cpp \ + tools/env.hpp tools/exceptions.cpp tools/exceptions.hpp \ + tools/expand.cpp tools/expand.hpp tools/fs.cpp tools/fs.hpp \ + tools/io.cpp tools/io.hpp tools/parser.cpp tools/parser.hpp \ + tools/process.cpp tools/process.hpp tools/reader.cpp \ + tools/reader.hpp tools/requirements.cpp tools/requirements.hpp \ + tools/signals.cpp tools/signals.hpp tools/test-program.cpp \ + tools/test-program.hpp tools/test_helpers.hpp tools/text.cpp \ + tools/text.hpp tools/timers.cpp tools/timers.hpp tools/ui.cpp \ + tools/ui.hpp tools/user.cpp tools/user.hpp +am__dirstamp = $(am__leading_dot)dirstamp +@ENABLE_TOOLS_TRUE@am_tools_libtools_a_OBJECTS = tools/tools_libtools_a-application.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-atffile.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config_file.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-env.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-exceptions.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-expand.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-fs.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-io.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-parser.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-process.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-reader.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-requirements.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-signals.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-test-program.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-text.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-timers.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-ui.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-user.$(OBJEXT) +nodist_tools_libtools_a_OBJECTS = +tools_libtools_a_OBJECTS = $(am_tools_libtools_a_OBJECTS) \ + $(nodist_tools_libtools_a_OBJECTS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -652,14 +611,11 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(tests_atf_c__dir)" \ "$(DESTDIR)$(tests_atf_c___detaildir)" \ "$(DESTDIR)$(tests_atf_c_detaildir)" \ - "$(DESTDIR)$(tests_atf_reportdir)" \ - "$(DESTDIR)$(tests_atf_rundir)" \ "$(DESTDIR)$(tests_test_programsdir)" \ - "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" \ - "$(DESTDIR)$(tests_atf_configdir)" \ - "$(DESTDIR)$(tests_atf_reportdir)" \ - "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" \ - "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(tests_atf_cdir)" \ + "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_shdir)" \ + "$(DESTDIR)$(tests_test_programsdir)" \ + "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" \ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" \ "$(DESTDIR)$(atf_aclocaldir)" \ @@ -672,15 +628,13 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(tests_atf_c__dir)" \ "$(DESTDIR)$(tests_atf_c___detaildir)" \ "$(DESTDIR)$(tests_atf_c_detaildir)" \ - "$(DESTDIR)$(tests_atf_configdir)" \ - "$(DESTDIR)$(tests_atf_reportdir)" \ - "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" \ - "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(xsldir)" \ + "$(DESTDIR)$(tests_atf_shdir)" \ + "$(DESTDIR)$(tests_test_programsdir)" \ + "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(xsldir)" \ "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" \ "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) atf_c___detail_libtest_helpers_la_LIBADD = -am__dirstamp = $(am__leading_dot)dirstamp am_atf_c___detail_libtest_helpers_la_OBJECTS = \ atf-c++/detail/test_helpers.lo atf_c___detail_libtest_helpers_la_OBJECTS = \ @@ -698,10 +652,8 @@ libatf_c___la_DEPENDENCIES = libatf-c.la am_libatf_c___la_OBJECTS = atf-c++/build.lo atf-c++/check.lo \ atf-c++/config.lo atf-c++/tests.lo atf-c++/utils.lo \ atf-c++/detail/application.lo atf-c++/detail/env.lo \ - atf-c++/detail/exceptions.lo atf-c++/detail/expand.lo \ - atf-c++/detail/fs.lo atf-c++/detail/parser.lo \ - atf-c++/detail/process.lo atf-c++/detail/text.lo \ - atf-c++/detail/ui.lo + atf-c++/detail/exceptions.lo atf-c++/detail/fs.lo \ + atf-c++/detail/process.lo atf-c++/detail/text.lo libatf_c___la_OBJECTS = $(am_libatf_c___la_OBJECTS) libatf_c___la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ @@ -727,14 +679,14 @@ libatf_c_la_OBJECTS = $(am_libatf_c_la_OBJECTS) \ libatf_c_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libatf_c_la_LDFLAGS) $(LDFLAGS) -o $@ -@ENABLE_TOOLS_TRUE@am__EXEEXT_1 = atf-report/atf-report$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-config/atf-config$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf-run$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ atf-version/atf-version$(EXEEXT) +@ENABLE_TOOLS_TRUE@am__EXEEXT_1 = tools/atf-config$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/atf-report$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/atf-run$(EXEEXT) \ +@ENABLE_TOOLS_TRUE@ tools/atf-version$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(tests_atf_c_PROGRAMS) \ $(tests_atf_c___PROGRAMS) $(tests_atf_c___detail_PROGRAMS) \ - $(tests_atf_c_detail_PROGRAMS) $(tests_atf_report_PROGRAMS) \ - $(tests_atf_run_PROGRAMS) $(tests_test_programs_PROGRAMS) + $(tests_atf_c_detail_PROGRAMS) $(tests_test_programs_PROGRAMS) \ + $(tests_tools_PROGRAMS) am_atf_c___atf_c___test_OBJECTS = atf-c++/atf_c++_test.$(OBJEXT) atf_c___atf_c___test_OBJECTS = $(am_atf_c___atf_c___test_OBJECTS) atf_c___atf_c___test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \ @@ -775,22 +727,10 @@ atf_c___detail_exceptions_test_OBJECTS = \ $(am_atf_c___detail_exceptions_test_OBJECTS) atf_c___detail_exceptions_test_DEPENDENCIES = \ atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -am_atf_c___detail_expand_test_OBJECTS = \ - atf-c++/detail/expand_test.$(OBJEXT) -atf_c___detail_expand_test_OBJECTS = \ - $(am_atf_c___detail_expand_test_OBJECTS) -atf_c___detail_expand_test_DEPENDENCIES = \ - atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) am_atf_c___detail_fs_test_OBJECTS = atf-c++/detail/fs_test.$(OBJEXT) atf_c___detail_fs_test_OBJECTS = $(am_atf_c___detail_fs_test_OBJECTS) atf_c___detail_fs_test_DEPENDENCIES = \ atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -am_atf_c___detail_parser_test_OBJECTS = \ - atf-c++/detail/parser_test.$(OBJEXT) -atf_c___detail_parser_test_OBJECTS = \ - $(am_atf_c___detail_parser_test_OBJECTS) -atf_c___detail_parser_test_DEPENDENCIES = \ - atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) am_atf_c___detail_process_test_OBJECTS = \ atf-c++/detail/process_test.$(OBJEXT) atf_c___detail_process_test_OBJECTS = \ @@ -809,10 +749,11 @@ atf_c___detail_text_test_OBJECTS = \ $(am_atf_c___detail_text_test_OBJECTS) atf_c___detail_text_test_DEPENDENCIES = \ atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -am_atf_c___detail_ui_test_OBJECTS = atf-c++/detail/ui_test.$(OBJEXT) -atf_c___detail_ui_test_OBJECTS = $(am_atf_c___detail_ui_test_OBJECTS) -atf_c___detail_ui_test_DEPENDENCIES = \ - atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) +am_atf_c___detail_version_helper_OBJECTS = \ + atf-c++/detail/version_helper.$(OBJEXT) +atf_c___detail_version_helper_OBJECTS = \ + $(am_atf_c___detail_version_helper_OBJECTS) +atf_c___detail_version_helper_LDADD = $(LDADD) am_atf_c___macros_test_OBJECTS = atf-c++/macros_test.$(OBJEXT) atf_c___macros_test_OBJECTS = $(am_atf_c___macros_test_OBJECTS) atf_c___macros_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \ @@ -888,6 +829,11 @@ am_atf_c_detail_user_test_OBJECTS = atf-c/detail/user_test.$(OBJEXT) atf_c_detail_user_test_OBJECTS = $(am_atf_c_detail_user_test_OBJECTS) atf_c_detail_user_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \ libatf-c.la +am_atf_c_detail_version_helper_OBJECTS = \ + atf-c/detail/version_helper.$(OBJEXT) +atf_c_detail_version_helper_OBJECTS = \ + $(am_atf_c_detail_version_helper_OBJECTS) +atf_c_detail_version_helper_LDADD = $(LDADD) am_atf_c_error_test_OBJECTS = atf-c/error_test.$(OBJEXT) atf_c_error_test_OBJECTS = $(am_atf_c_error_test_OBJECTS) atf_c_error_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \ @@ -908,206 +854,21 @@ am_atf_c_utils_test_OBJECTS = atf-c/utils_test.$(OBJEXT) atf_c_utils_test_OBJECTS = $(am_atf_c_utils_test_OBJECTS) atf_c_utils_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \ libatf-c.la -am__atf_config_atf_config_SOURCES_DIST = atf-config/atf-config.cpp -@ENABLE_TOOLS_TRUE@am_atf_config_atf_config_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-config/atf-config.$(OBJEXT) -atf_config_atf_config_OBJECTS = $(am_atf_config_atf_config_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_config_atf_config_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_atf_report_SOURCES_DIST = atf-report/atf-report.cpp \ - atf-report/reader.cpp atf-report/reader.hpp -@ENABLE_TOOLS_TRUE@am_atf_report_atf_report_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-report/atf-report.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/reader.$(OBJEXT) -atf_report_atf_report_OBJECTS = $(am_atf_report_atf_report_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_atf_report_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_fail_helper_SOURCES_DIST = atf-report/fail_helper.cpp -@ENABLE_TOOLS_TRUE@am_atf_report_fail_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-report/fail_helper.$(OBJEXT) -atf_report_fail_helper_OBJECTS = $(am_atf_report_fail_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_fail_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_misc_helpers_SOURCES_DIST = \ - atf-report/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@am_atf_report_misc_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-report/misc_helpers.$(OBJEXT) -atf_report_misc_helpers_OBJECTS = \ - $(am_atf_report_misc_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_misc_helpers_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_pass_helper_SOURCES_DIST = atf-report/pass_helper.cpp -@ENABLE_TOOLS_TRUE@am_atf_report_pass_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-report/pass_helper.$(OBJEXT) -atf_report_pass_helper_OBJECTS = $(am_atf_report_pass_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_pass_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_report_reader_test_SOURCES_DIST = atf-report/reader_test.cpp \ - atf-report/reader.cpp -@ENABLE_TOOLS_TRUE@am_atf_report_reader_test_OBJECTS = atf-report/atf_report_reader_test-reader_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-report/atf_report_reader_test-reader.$(OBJEXT) -atf_report_reader_test_OBJECTS = $(am_atf_report_reader_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_report_reader_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_atf_run_SOURCES_DIST = atf-run/atf-run.cpp \ - atf-run/atffile.cpp atf-run/atffile.hpp atf-run/config.cpp \ - atf-run/config.hpp atf-run/fs.cpp atf-run/fs.hpp \ - atf-run/io.cpp atf-run/io.hpp atf-run/requirements.cpp \ - atf-run/requirements.hpp atf-run/signals.cpp \ - atf-run/signals.hpp atf-run/test-program.cpp \ - atf-run/test-program.hpp atf-run/timer.cpp atf-run/timer.hpp \ - atf-run/user.cpp atf-run/user.hpp -@ENABLE_TOOLS_TRUE@am_atf_run_atf_run_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-atf-run.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-atffile.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-config.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-fs.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-io.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-requirements.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-signals.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-test-program.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-timer.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atf_run-user.$(OBJEXT) -atf_run_atf_run_OBJECTS = $(am_atf_run_atf_run_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_atf_run_DEPENDENCIES = $(ATF_CXX_LIBS) -am__atf_run_atffile_test_SOURCES_DIST = atf-run/atffile_test.cpp \ - atf-run/atffile.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_atffile_test_OBJECTS = atf-run/atf_run_atffile_test-atffile_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_atffile_test-atffile.$(OBJEXT) -atf_run_atffile_test_OBJECTS = $(am_atf_run_atffile_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_atffile_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_bad_metadata_helper_SOURCES_DIST = \ - atf-run/bad_metadata_helper.c -@ENABLE_TOOLS_TRUE@am_atf_run_bad_metadata_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/bad_metadata_helper.$(OBJEXT) -atf_run_bad_metadata_helper_OBJECTS = \ - $(am_atf_run_bad_metadata_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_bad_metadata_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ libatf-c.la -am__atf_run_config_test_SOURCES_DIST = atf-run/config_test.cpp \ - atf-run/config.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_config_test_OBJECTS = atf-run/atf_run_config_test-config_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_config_test-config.$(OBJEXT) -atf_run_config_test_OBJECTS = $(am_atf_run_config_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_config_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_expect_helpers_SOURCES_DIST = atf-run/expect_helpers.c -@ENABLE_TOOLS_TRUE@am_atf_run_expect_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/expect_helpers.$(OBJEXT) -atf_run_expect_helpers_OBJECTS = $(am_atf_run_expect_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_expect_helpers_DEPENDENCIES = libatf-c.la -am__atf_run_fs_test_SOURCES_DIST = atf-run/fs_test.cpp atf-run/fs.cpp \ - atf-run/user.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_fs_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/fs_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/fs.$(OBJEXT) atf-run/user.$(OBJEXT) -atf_run_fs_test_OBJECTS = $(am_atf_run_fs_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_fs_test_DEPENDENCIES = $(ATF_CXX_LIBS) -am__atf_run_io_test_SOURCES_DIST = atf-run/io_test.cpp atf-run/io.cpp \ - atf-run/signals.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_io_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/io_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/io.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/signals.$(OBJEXT) -atf_run_io_test_OBJECTS = $(am_atf_run_io_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_io_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_misc_helpers_SOURCES_DIST = atf-run/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_misc_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/misc_helpers.$(OBJEXT) -atf_run_misc_helpers_OBJECTS = $(am_atf_run_misc_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_misc_helpers_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_pass_helper_SOURCES_DIST = atf-run/pass_helper.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_pass_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/pass_helper.$(OBJEXT) -atf_run_pass_helper_OBJECTS = $(am_atf_run_pass_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_pass_helper_DEPENDENCIES = $(ATF_CXX_LIBS) -am__atf_run_requirements_test_SOURCES_DIST = \ - atf-run/requirements_test.cpp atf-run/requirements.cpp \ - atf-run/user.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_requirements_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/user.$(OBJEXT) -atf_run_requirements_test_OBJECTS = \ - $(am_atf_run_requirements_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_requirements_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_several_tcs_helper_SOURCES_DIST = \ - atf-run/several_tcs_helper.c -@ENABLE_TOOLS_TRUE@am_atf_run_several_tcs_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/several_tcs_helper.$(OBJEXT) -atf_run_several_tcs_helper_OBJECTS = \ - $(am_atf_run_several_tcs_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_several_tcs_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ libatf-c.la -am__atf_run_signals_test_SOURCES_DIST = atf-run/signals_test.cpp \ - atf-run/signals.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_signals_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/signals_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/signals.$(OBJEXT) -atf_run_signals_test_OBJECTS = $(am_atf_run_signals_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_signals_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_test_program_test_SOURCES_DIST = \ - atf-run/test_program_test.cpp atf-run/fs.cpp atf-run/io.cpp \ - atf-run/requirements.cpp atf-run/signals.cpp \ - atf-run/test-program.cpp atf-run/timer.cpp atf-run/user.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_test_program_test_OBJECTS = atf-run/atf_run_test_program_test-test_program_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-fs.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-io.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-requirements.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-signals.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-test-program.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-timer.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/atf_run_test_program_test-user.$(OBJEXT) -atf_run_test_program_test_OBJECTS = \ - $(am_atf_run_test_program_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_test_program_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ atf-c++/detail/libtest_helpers.la \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__atf_run_user_test_SOURCES_DIST = atf-run/user_test.cpp \ - atf-run/user.cpp -@ENABLE_TOOLS_TRUE@am_atf_run_user_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/user_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ atf-run/user.$(OBJEXT) -atf_run_user_test_OBJECTS = $(am_atf_run_user_test_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_user_test_DEPENDENCIES = $(ATF_CXX_LIBS) -am__atf_run_zero_tcs_helper_SOURCES_DIST = atf-run/zero_tcs_helper.c -@ENABLE_TOOLS_TRUE@am_atf_run_zero_tcs_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ atf-run/zero_tcs_helper.$(OBJEXT) -atf_run_zero_tcs_helper_OBJECTS = \ - $(am_atf_run_zero_tcs_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_run_zero_tcs_helper_DEPENDENCIES = libatf-c.la am_atf_sh_atf_check_OBJECTS = atf-sh/atf-check.$(OBJEXT) atf_sh_atf_check_OBJECTS = $(am_atf_sh_atf_check_OBJECTS) atf_sh_atf_check_DEPENDENCIES = $(ATF_CXX_LIBS) am_atf_sh_atf_sh_OBJECTS = atf-sh/atf-sh.$(OBJEXT) atf_sh_atf_sh_OBJECTS = $(am_atf_sh_atf_sh_OBJECTS) atf_sh_atf_sh_DEPENDENCIES = $(ATF_CXX_LIBS) -am__atf_version_atf_version_SOURCES_DIST = \ - atf-version/atf-version.cpp -@ENABLE_TOOLS_TRUE@am_atf_version_atf_version_OBJECTS = atf-version/atf_version_atf_version-atf-version.$(OBJEXT) -nodist_atf_version_atf_version_OBJECTS = -atf_version_atf_version_OBJECTS = \ - $(am_atf_version_atf_version_OBJECTS) \ - $(nodist_atf_version_atf_version_OBJECTS) -@ENABLE_TOOLS_TRUE@atf_version_atf_version_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) am_bootstrap_h_app_empty_OBJECTS = bootstrap/h_app_empty.$(OBJEXT) bootstrap_h_app_empty_OBJECTS = $(am_bootstrap_h_app_empty_OBJECTS) -bootstrap_h_app_empty_DEPENDENCIES = $(ATF_CXX_LIBS) +bootstrap_h_app_empty_DEPENDENCIES = tools/libtools.a $(ATF_CXX_LIBS) am_bootstrap_h_app_opts_args_OBJECTS = \ bootstrap/h_app_opts_args.$(OBJEXT) bootstrap_h_app_opts_args_OBJECTS = \ $(am_bootstrap_h_app_opts_args_OBJECTS) -bootstrap_h_app_opts_args_DEPENDENCIES = $(ATF_CXX_LIBS) +bootstrap_h_app_opts_args_DEPENDENCIES = tools/libtools.a \ + $(ATF_CXX_LIBS) am_bootstrap_h_tp_basic_c_OBJECTS = bootstrap/h_tp_basic_c.$(OBJEXT) bootstrap_h_tp_basic_c_OBJECTS = $(am_bootstrap_h_tp_basic_c_OBJECTS) bootstrap_h_tp_basic_c_DEPENDENCIES = libatf-c.la @@ -1126,10 +887,179 @@ am_test_programs_cpp_helpers_OBJECTS = \ test_programs_cpp_helpers_OBJECTS = \ $(am_test_programs_cpp_helpers_OBJECTS) test_programs_cpp_helpers_DEPENDENCIES = $(ATF_CXX_LIBS) +am__tools_application_test_SOURCES_DIST = tools/application_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_application_test_OBJECTS = tools/tools_application_test-application_test.$(OBJEXT) +tools_application_test_OBJECTS = $(am_tools_application_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_application_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_atf_config_SOURCES_DIST = tools/atf-config.cpp +@ENABLE_TOOLS_TRUE@am_tools_atf_config_OBJECTS = tools/tools_atf_config-atf-config.$(OBJEXT) +tools_atf_config_OBJECTS = $(am_tools_atf_config_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atf_config_DEPENDENCIES = $(TOOLS_LDADD) +am__tools_atf_report_SOURCES_DIST = tools/atf-report.cpp +@ENABLE_TOOLS_TRUE@am_tools_atf_report_OBJECTS = tools/tools_atf_report-atf-report.$(OBJEXT) +tools_atf_report_OBJECTS = $(am_tools_atf_report_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atf_report_DEPENDENCIES = $(TOOLS_LDADD) +am__tools_atf_run_SOURCES_DIST = tools/atf-run.cpp +@ENABLE_TOOLS_TRUE@am_tools_atf_run_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_atf_run-atf-run.$(OBJEXT) +tools_atf_run_OBJECTS = $(am_tools_atf_run_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atf_run_DEPENDENCIES = $(TOOLS_LDADD) +am__tools_atf_version_SOURCES_DIST = tools/atf-version.cpp +@ENABLE_TOOLS_TRUE@am_tools_atf_version_OBJECTS = tools/tools_atf_version-atf-version.$(OBJEXT) +nodist_tools_atf_version_OBJECTS = +tools_atf_version_OBJECTS = $(am_tools_atf_version_OBJECTS) \ + $(nodist_tools_atf_version_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atf_version_DEPENDENCIES = $(TOOLS_LDADD) +am__tools_atffile_test_SOURCES_DIST = tools/atffile_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_atffile_test_OBJECTS = tools/tools_atffile_test-atffile_test.$(OBJEXT) +tools_atffile_test_OBJECTS = $(am_tools_atffile_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_atffile_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_auto_array_test_SOURCES_DIST = tools/auto_array_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_auto_array_test_OBJECTS = tools/tools_auto_array_test-auto_array_test.$(OBJEXT) +tools_auto_array_test_OBJECTS = $(am_tools_auto_array_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_auto_array_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_bad_metadata_helper_SOURCES_DIST = \ + tools/bad_metadata_helper.c +@ENABLE_TOOLS_TRUE@am_tools_bad_metadata_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper.$(OBJEXT) +tools_bad_metadata_helper_OBJECTS = \ + $(am_tools_bad_metadata_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ libatf-c.la +am__tools_config_file_test_SOURCES_DIST = tools/config_file_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_config_file_test_OBJECTS = tools/tools_config_file_test-config_file_test.$(OBJEXT) +tools_config_file_test_OBJECTS = $(am_tools_config_file_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_config_file_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_config_test_SOURCES_DIST = tools/config_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_config_test_OBJECTS = tools/tools_config_test-config_test.$(OBJEXT) +tools_config_test_OBJECTS = $(am_tools_config_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_config_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_env_test_SOURCES_DIST = tools/env_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_env_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_env_test-env_test.$(OBJEXT) +tools_env_test_OBJECTS = $(am_tools_env_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_env_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_expand_test_SOURCES_DIST = tools/expand_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_expand_test_OBJECTS = tools/tools_expand_test-expand_test.$(OBJEXT) +tools_expand_test_OBJECTS = $(am_tools_expand_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_expand_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_expect_helpers_SOURCES_DIST = tools/expect_helpers.c +@ENABLE_TOOLS_TRUE@am_tools_expect_helpers_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/expect_helpers.$(OBJEXT) +tools_expect_helpers_OBJECTS = $(am_tools_expect_helpers_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_expect_helpers_DEPENDENCIES = libatf-c.la +am__tools_fail_helper_SOURCES_DIST = tools/fail_helper.cpp +@ENABLE_TOOLS_TRUE@am_tools_fail_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/fail_helper.$(OBJEXT) +tools_fail_helper_OBJECTS = $(am_tools_fail_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_fail_helper_DEPENDENCIES = $(ATF_CXX_LIBS) +am__tools_fs_test_SOURCES_DIST = tools/fs_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_fs_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_fs_test-fs_test.$(OBJEXT) +tools_fs_test_OBJECTS = $(am_tools_fs_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_fs_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_io_test_SOURCES_DIST = tools/io_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_io_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_io_test-io_test.$(OBJEXT) +tools_io_test_OBJECTS = $(am_tools_io_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_io_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_misc_helpers_SOURCES_DIST = tools/misc_helpers.cpp +@ENABLE_TOOLS_TRUE@am_tools_misc_helpers_OBJECTS = tools/tools_misc_helpers-misc_helpers.$(OBJEXT) +tools_misc_helpers_OBJECTS = $(am_tools_misc_helpers_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_misc_helpers_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_parser_test_SOURCES_DIST = tools/parser_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_parser_test_OBJECTS = tools/tools_parser_test-parser_test.$(OBJEXT) +tools_parser_test_OBJECTS = $(am_tools_parser_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_parser_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_pass_helper_SOURCES_DIST = tools/pass_helper.cpp +@ENABLE_TOOLS_TRUE@am_tools_pass_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/pass_helper.$(OBJEXT) +tools_pass_helper_OBJECTS = $(am_tools_pass_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_pass_helper_DEPENDENCIES = $(ATF_CXX_LIBS) +am__tools_process_helpers_SOURCES_DIST = tools/process_helpers.c +@ENABLE_TOOLS_TRUE@am_tools_process_helpers_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/process_helpers.$(OBJEXT) +tools_process_helpers_OBJECTS = $(am_tools_process_helpers_OBJECTS) +tools_process_helpers_LDADD = $(LDADD) +am__tools_process_test_SOURCES_DIST = tools/process_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_process_test_OBJECTS = tools/tools_process_test-process_test.$(OBJEXT) +tools_process_test_OBJECTS = $(am_tools_process_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_process_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_reader_test_SOURCES_DIST = tools/reader_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_reader_test_OBJECTS = tools/tools_reader_test-reader_test.$(OBJEXT) +tools_reader_test_OBJECTS = $(am_tools_reader_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_reader_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_requirements_test_SOURCES_DIST = \ + tools/requirements_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_requirements_test_OBJECTS = tools/tools_requirements_test-requirements_test.$(OBJEXT) +tools_requirements_test_OBJECTS = \ + $(am_tools_requirements_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_requirements_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_several_tcs_helper_SOURCES_DIST = \ + tools/several_tcs_helper.c +@ENABLE_TOOLS_TRUE@am_tools_several_tcs_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/several_tcs_helper.$(OBJEXT) +tools_several_tcs_helper_OBJECTS = \ + $(am_tools_several_tcs_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_several_tcs_helper_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ libatf-c.la +am__tools_signals_test_SOURCES_DIST = tools/signals_test.cpp \ + tools/signals.cpp +@ENABLE_TOOLS_TRUE@am_tools_signals_test_OBJECTS = tools/tools_signals_test-signals_test.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_signals_test-signals.$(OBJEXT) +tools_signals_test_OBJECTS = $(am_tools_signals_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_signals_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_test_program_test_SOURCES_DIST = \ + tools/test_program_test.cpp +@ENABLE_TOOLS_TRUE@am_tools_test_program_test_OBJECTS = tools/tools_test_program_test-test_program_test.$(OBJEXT) +tools_test_program_test_OBJECTS = \ + $(am_tools_test_program_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_test_program_test_DEPENDENCIES = \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) +am__tools_text_test_SOURCES_DIST = tools/text_test.cpp tools/text.cpp +@ENABLE_TOOLS_TRUE@am_tools_text_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_text_test-text_test.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_text_test-text.$(OBJEXT) +tools_text_test_OBJECTS = $(am_tools_text_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_text_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_ui_test_SOURCES_DIST = tools/ui_test.cpp tools/ui.cpp +@ENABLE_TOOLS_TRUE@am_tools_ui_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui_test.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui.$(OBJEXT) +tools_ui_test_OBJECTS = $(am_tools_ui_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_ui_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_user_test_SOURCES_DIST = tools/user_test.cpp tools/user.cpp +@ENABLE_TOOLS_TRUE@am_tools_user_test_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/tools_user_test-user_test.$(OBJEXT) \ +@ENABLE_TOOLS_TRUE@ tools/tools_user_test-user.$(OBJEXT) +tools_user_test_OBJECTS = $(am_tools_user_test_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_user_test_DEPENDENCIES = $(TOOLS_LDADD) \ +@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) +am__tools_zero_tcs_helper_SOURCES_DIST = tools/zero_tcs_helper.c +@ENABLE_TOOLS_TRUE@am_tools_zero_tcs_helper_OBJECTS = \ +@ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper.$(OBJEXT) +tools_zero_tcs_helper_OBJECTS = $(am_tools_zero_tcs_helper_OBJECTS) +@ENABLE_TOOLS_TRUE@tools_zero_tcs_helper_DEPENDENCIES = libatf-c.la SCRIPTS = $(tests_atf_c_SCRIPTS) $(tests_atf_c___SCRIPTS) \ - $(tests_atf_config_SCRIPTS) $(tests_atf_report_SCRIPTS) \ - $(tests_atf_run_SCRIPTS) $(tests_atf_sh_SCRIPTS) \ - $(tests_test_programs_SCRIPTS) + $(tests_atf_sh_SCRIPTS) $(tests_test_programs_SCRIPTS) \ + $(tests_tools_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -1182,7 +1112,9 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \ +SOURCES = $(tools_libtools_a_SOURCES) \ + $(nodist_tools_libtools_a_SOURCES) \ + $(atf_c___detail_libtest_helpers_la_SOURCES) \ $(atf_c_detail_libtest_helpers_la_SOURCES) \ $(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \ $(nodist_libatf_c_la_SOURCES) $(atf_c___atf_c___test_SOURCES) \ @@ -1192,13 +1124,11 @@ SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \ $(atf_c___detail_auto_array_test_SOURCES) \ $(atf_c___detail_env_test_SOURCES) \ $(atf_c___detail_exceptions_test_SOURCES) \ - $(atf_c___detail_expand_test_SOURCES) \ $(atf_c___detail_fs_test_SOURCES) \ - $(atf_c___detail_parser_test_SOURCES) \ $(atf_c___detail_process_test_SOURCES) \ $(atf_c___detail_sanity_test_SOURCES) \ $(atf_c___detail_text_test_SOURCES) \ - $(atf_c___detail_ui_test_SOURCES) \ + $(atf_c___detail_version_helper_SOURCES) \ $(atf_c___macros_test_SOURCES) $(atf_c___tests_test_SOURCES) \ $(atf_c___utils_test_SOURCES) $(atf_c_atf_c_test_SOURCES) \ $(atf_c_build_test_SOURCES) $(atf_c_check_test_SOURCES) \ @@ -1212,36 +1142,38 @@ SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \ $(atf_c_detail_process_test_SOURCES) \ $(atf_c_detail_sanity_test_SOURCES) \ $(atf_c_detail_text_test_SOURCES) \ - $(atf_c_detail_user_test_SOURCES) $(atf_c_error_test_SOURCES) \ - $(atf_c_macros_test_SOURCES) $(atf_c_tc_test_SOURCES) \ - $(atf_c_tp_test_SOURCES) $(atf_c_utils_test_SOURCES) \ - $(atf_config_atf_config_SOURCES) \ - $(atf_report_atf_report_SOURCES) \ - $(atf_report_fail_helper_SOURCES) \ - $(atf_report_misc_helpers_SOURCES) \ - $(atf_report_pass_helper_SOURCES) \ - $(atf_report_reader_test_SOURCES) $(atf_run_atf_run_SOURCES) \ - $(atf_run_atffile_test_SOURCES) \ - $(atf_run_bad_metadata_helper_SOURCES) \ - $(atf_run_config_test_SOURCES) \ - $(atf_run_expect_helpers_SOURCES) $(atf_run_fs_test_SOURCES) \ - $(atf_run_io_test_SOURCES) $(atf_run_misc_helpers_SOURCES) \ - $(atf_run_pass_helper_SOURCES) \ - $(atf_run_requirements_test_SOURCES) \ - $(atf_run_several_tcs_helper_SOURCES) \ - $(atf_run_signals_test_SOURCES) \ - $(atf_run_test_program_test_SOURCES) \ - $(atf_run_user_test_SOURCES) \ - $(atf_run_zero_tcs_helper_SOURCES) $(atf_sh_atf_check_SOURCES) \ - $(atf_sh_atf_sh_SOURCES) $(atf_version_atf_version_SOURCES) \ - $(nodist_atf_version_atf_version_SOURCES) \ - $(bootstrap_h_app_empty_SOURCES) \ + $(atf_c_detail_user_test_SOURCES) \ + $(atf_c_detail_version_helper_SOURCES) \ + $(atf_c_error_test_SOURCES) $(atf_c_macros_test_SOURCES) \ + $(atf_c_tc_test_SOURCES) $(atf_c_tp_test_SOURCES) \ + $(atf_c_utils_test_SOURCES) $(atf_sh_atf_check_SOURCES) \ + $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_app_empty_SOURCES) \ $(bootstrap_h_app_opts_args_SOURCES) \ $(bootstrap_h_tp_basic_c_SOURCES) \ $(bootstrap_h_tp_basic_cpp_SOURCES) \ $(test_programs_c_helpers_SOURCES) \ - $(test_programs_cpp_helpers_SOURCES) -DIST_SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \ + $(test_programs_cpp_helpers_SOURCES) \ + $(tools_application_test_SOURCES) $(tools_atf_config_SOURCES) \ + $(tools_atf_report_SOURCES) $(tools_atf_run_SOURCES) \ + $(tools_atf_version_SOURCES) \ + $(nodist_tools_atf_version_SOURCES) \ + $(tools_atffile_test_SOURCES) $(tools_auto_array_test_SOURCES) \ + $(tools_bad_metadata_helper_SOURCES) \ + $(tools_config_file_test_SOURCES) $(tools_config_test_SOURCES) \ + $(tools_env_test_SOURCES) $(tools_expand_test_SOURCES) \ + $(tools_expect_helpers_SOURCES) $(tools_fail_helper_SOURCES) \ + $(tools_fs_test_SOURCES) $(tools_io_test_SOURCES) \ + $(tools_misc_helpers_SOURCES) $(tools_parser_test_SOURCES) \ + $(tools_pass_helper_SOURCES) $(tools_process_helpers_SOURCES) \ + $(tools_process_test_SOURCES) $(tools_reader_test_SOURCES) \ + $(tools_requirements_test_SOURCES) \ + $(tools_several_tcs_helper_SOURCES) \ + $(tools_signals_test_SOURCES) \ + $(tools_test_program_test_SOURCES) $(tools_text_test_SOURCES) \ + $(tools_ui_test_SOURCES) $(tools_user_test_SOURCES) \ + $(tools_zero_tcs_helper_SOURCES) +DIST_SOURCES = $(am__tools_libtools_a_SOURCES_DIST) \ + $(atf_c___detail_libtest_helpers_la_SOURCES) \ $(atf_c_detail_libtest_helpers_la_SOURCES) \ $(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \ $(atf_c___atf_c___test_SOURCES) $(atf_c___build_test_SOURCES) \ @@ -1250,13 +1182,11 @@ DIST_SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \ $(atf_c___detail_auto_array_test_SOURCES) \ $(atf_c___detail_env_test_SOURCES) \ $(atf_c___detail_exceptions_test_SOURCES) \ - $(atf_c___detail_expand_test_SOURCES) \ $(atf_c___detail_fs_test_SOURCES) \ - $(atf_c___detail_parser_test_SOURCES) \ $(atf_c___detail_process_test_SOURCES) \ $(atf_c___detail_sanity_test_SOURCES) \ $(atf_c___detail_text_test_SOURCES) \ - $(atf_c___detail_ui_test_SOURCES) \ + $(atf_c___detail_version_helper_SOURCES) \ $(atf_c___macros_test_SOURCES) $(atf_c___tests_test_SOURCES) \ $(atf_c___utils_test_SOURCES) $(atf_c_atf_c_test_SOURCES) \ $(atf_c_build_test_SOURCES) $(atf_c_check_test_SOURCES) \ @@ -1270,38 +1200,47 @@ DIST_SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \ $(atf_c_detail_process_test_SOURCES) \ $(atf_c_detail_sanity_test_SOURCES) \ $(atf_c_detail_text_test_SOURCES) \ - $(atf_c_detail_user_test_SOURCES) $(atf_c_error_test_SOURCES) \ - $(atf_c_macros_test_SOURCES) $(atf_c_tc_test_SOURCES) \ - $(atf_c_tp_test_SOURCES) $(atf_c_utils_test_SOURCES) \ - $(am__atf_config_atf_config_SOURCES_DIST) \ - $(am__atf_report_atf_report_SOURCES_DIST) \ - $(am__atf_report_fail_helper_SOURCES_DIST) \ - $(am__atf_report_misc_helpers_SOURCES_DIST) \ - $(am__atf_report_pass_helper_SOURCES_DIST) \ - $(am__atf_report_reader_test_SOURCES_DIST) \ - $(am__atf_run_atf_run_SOURCES_DIST) \ - $(am__atf_run_atffile_test_SOURCES_DIST) \ - $(am__atf_run_bad_metadata_helper_SOURCES_DIST) \ - $(am__atf_run_config_test_SOURCES_DIST) \ - $(am__atf_run_expect_helpers_SOURCES_DIST) \ - $(am__atf_run_fs_test_SOURCES_DIST) \ - $(am__atf_run_io_test_SOURCES_DIST) \ - $(am__atf_run_misc_helpers_SOURCES_DIST) \ - $(am__atf_run_pass_helper_SOURCES_DIST) \ - $(am__atf_run_requirements_test_SOURCES_DIST) \ - $(am__atf_run_several_tcs_helper_SOURCES_DIST) \ - $(am__atf_run_signals_test_SOURCES_DIST) \ - $(am__atf_run_test_program_test_SOURCES_DIST) \ - $(am__atf_run_user_test_SOURCES_DIST) \ - $(am__atf_run_zero_tcs_helper_SOURCES_DIST) \ - $(atf_sh_atf_check_SOURCES) $(atf_sh_atf_sh_SOURCES) \ - $(am__atf_version_atf_version_SOURCES_DIST) \ - $(bootstrap_h_app_empty_SOURCES) \ + $(atf_c_detail_user_test_SOURCES) \ + $(atf_c_detail_version_helper_SOURCES) \ + $(atf_c_error_test_SOURCES) $(atf_c_macros_test_SOURCES) \ + $(atf_c_tc_test_SOURCES) $(atf_c_tp_test_SOURCES) \ + $(atf_c_utils_test_SOURCES) $(atf_sh_atf_check_SOURCES) \ + $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_app_empty_SOURCES) \ $(bootstrap_h_app_opts_args_SOURCES) \ $(bootstrap_h_tp_basic_c_SOURCES) \ $(bootstrap_h_tp_basic_cpp_SOURCES) \ $(test_programs_c_helpers_SOURCES) \ - $(test_programs_cpp_helpers_SOURCES) + $(test_programs_cpp_helpers_SOURCES) \ + $(am__tools_application_test_SOURCES_DIST) \ + $(am__tools_atf_config_SOURCES_DIST) \ + $(am__tools_atf_report_SOURCES_DIST) \ + $(am__tools_atf_run_SOURCES_DIST) \ + $(am__tools_atf_version_SOURCES_DIST) \ + $(am__tools_atffile_test_SOURCES_DIST) \ + $(am__tools_auto_array_test_SOURCES_DIST) \ + $(am__tools_bad_metadata_helper_SOURCES_DIST) \ + $(am__tools_config_file_test_SOURCES_DIST) \ + $(am__tools_config_test_SOURCES_DIST) \ + $(am__tools_env_test_SOURCES_DIST) \ + $(am__tools_expand_test_SOURCES_DIST) \ + $(am__tools_expect_helpers_SOURCES_DIST) \ + $(am__tools_fail_helper_SOURCES_DIST) \ + $(am__tools_fs_test_SOURCES_DIST) \ + $(am__tools_io_test_SOURCES_DIST) \ + $(am__tools_misc_helpers_SOURCES_DIST) \ + $(am__tools_parser_test_SOURCES_DIST) \ + $(am__tools_pass_helper_SOURCES_DIST) \ + $(am__tools_process_helpers_SOURCES_DIST) \ + $(am__tools_process_test_SOURCES_DIST) \ + $(am__tools_reader_test_SOURCES_DIST) \ + $(am__tools_requirements_test_SOURCES_DIST) \ + $(am__tools_several_tcs_helper_SOURCES_DIST) \ + $(am__tools_signals_test_SOURCES_DIST) \ + $(am__tools_test_program_test_SOURCES_DIST) \ + $(am__tools_text_test_SOURCES_DIST) \ + $(am__tools_ui_test_SOURCES_DIST) \ + $(am__tools_user_test_SOURCES_DIST) \ + $(am__tools_zero_tcs_helper_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -1319,9 +1258,8 @@ DATA = $(atf_aclocal_DATA) $(atf_c__dirpkgconfig_DATA) \ $(css_DATA) $(doc_DATA) $(dtd_DATA) $(eg_DATA) $(hooks_DATA) \ $(noinst_DATA) $(pkgtests_DATA) $(tests_atf_c_DATA) \ $(tests_atf_c___DATA) $(tests_atf_c___detail_DATA) \ - $(tests_atf_c_detail_DATA) $(tests_atf_config_DATA) \ - $(tests_atf_report_DATA) $(tests_atf_run_DATA) \ - $(tests_atf_sh_DATA) $(tests_test_programs_DATA) $(xsl_DATA) + $(tests_atf_c_detail_DATA) $(tests_atf_sh_DATA) \ + $(tests_test_programs_DATA) $(tests_tools_DATA) $(xsl_DATA) HEADERS = $(atf_c_HEADERS) $(atf_c___HEADERS) $(include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)bconfig.h.in @@ -1513,17 +1451,25 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ atf_aclocal_DATA = atf-c/atf-common.m4 atf-c/atf-c.m4 \ atf-c++/atf-c++.m4 atf-sh/atf-sh.m4 -BUILT_SOURCES = $(am__append_8) +BUILT_SOURCES = $(am__append_5) CLEANFILES = atf-c/atf-c.pc atf-c/pkg_config_test atf-c++/atf-c++.pc \ atf-c++/pkg_config_test atf-sh/atf-sh.pc atf-sh/misc_helpers \ atf-sh/atf_check_test atf-sh/atf-check_test atf-sh/config_test \ atf-sh/integration_test atf-sh/normalize_test atf-sh/tc_test \ atf-sh/tp_test bootstrap/h_tp_basic_sh \ bootstrap/h_tp_atf_check_sh bootstrap/h_tp_fail \ - bootstrap/h_tp_pass $(am__append_2) test-programs/sh_helpers \ + bootstrap/h_tp_pass test-programs/sh_helpers \ test-programs/config_test test-programs/expect_test \ test-programs/meta_data_test test-programs/result_test \ - test-programs/srcdir_test $(am__append_7) + test-programs/srcdir_test $(am__append_6) + +# XXX For some reason, the nodist line above does not work as expected. +# Work this problem around. + +# +# Custom targets. +# +DIST_HOOKS = kill-defs-h $(am__append_1) forbid-dist EXTRA_DIST = admin/check-style-common.awk admin/check-style-c.awk \ admin/check-style-cpp.awk admin/check-style-man.awk \ admin/check-style-shell.awk admin/check-style.sh \ @@ -1540,24 +1486,24 @@ EXTRA_DIST = admin/check-style-common.awk admin/check-style-c.awk \ bootstrap/h_tp_basic_sh.sh bootstrap/h_tp_atf_check_sh.sh \ bootstrap/h_tp_fail.sh bootstrap/h_tp_pass.sh \ bootstrap/testsuite bootstrap/package.m4 \ - bootstrap/testsuite.at $(testsuite_incs) $(am__append_3) \ + bootstrap/testsuite.at $(testsuite_incs) \ $(tests_test_programs_DATA) test-programs/common.sh \ test-programs/sh_helpers.sh test-programs/config_test.sh \ test-programs/expect_test.sh test-programs/meta_data_test.sh \ test-programs/result_test.sh test-programs/srcdir_test.sh \ - $(am__append_6) $(doc_DATA) INSTALL README $(pkgtests_DATA) + $(am__append_4) $(doc_DATA) INSTALL README $(pkgtests_DATA) dist_man_MANS = atf-c/atf-c-api.3 atf-c++/atf-c++-api.3 \ atf-sh/atf-check.1 atf-sh/atf-sh.1 atf-sh/atf-sh-api.3 \ - doc/atf-test-case.4 doc/atf-test-program.1 $(am__append_4) + doc/atf-test-case.4 doc/atf-test-program.1 $(am__append_3) include_HEADERS = atf-c.h atf-c++.hpp lib_LTLIBRARIES = libatf-c.la libatf-c++.la -man_MANS = $(am__append_1) +man_MANS = $(am__append_8) noinst_DATA = INSTALL README noinst_LTLIBRARIES = atf-c/detail/libtest_helpers.la \ atf-c++/detail/libtest_helpers.la -INSTALLCHECK_TARGETS = installcheck-bootstrap $(am__append_10) \ - $(am__append_11) -PHONY_TARGETS = check-style installcheck-bootstrap $(am__append_9) \ +INSTALLCHECK_TARGETS = installcheck-bootstrap $(am__append_9) \ + $(am__append_10) +PHONY_TARGETS = check-style installcheck-bootstrap $(am__append_7) \ installcheck-kyua clean-all release release-test ACLOCAL_AMFLAGS = -I m4 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tools @@ -1573,23 +1519,17 @@ libatf_c_la_SOURCES = atf-c/build.c atf-c/build.h atf-c/check.c \ atf-c/detail/sanity.h atf-c/detail/text.c atf-c/detail/text.h \ atf-c/detail/tp_main.c atf-c/detail/user.c atf-c/detail/user.h nodist_libatf_c_la_SOURCES = atf-c/defs.h -libatf_c_la_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \ - "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ +libatf_c_la_CPPFLAGS = "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \ "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \ "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \ "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \ "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \ - "-DATF_CONFDIR=\"$(atf_confdir)\"" \ "-DATF_INCLUDEDIR=\"$(includedir)\"" \ - "-DATF_LIBDIR=\"$(libdir)\"" \ "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \ - "-DATF_MACHINE=\"$(atf_machine)\"" \ - "-DATF_M4=\"$(ATF_M4)\"" \ "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \ "-DATF_SHELL=\"$(ATF_SHELL)\"" \ - "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \ - -I$(srcdir)/atf-c + "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" libatf_c_la_LDFLAGS = -version-info 0:0:0 atf_c_HEADERS = atf-c/build.h \ @@ -1658,29 +1598,25 @@ atf_c_detail_text_test_SOURCES = atf-c/detail/text_test.c atf_c_detail_text_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la atf_c_detail_user_test_SOURCES = atf-c/detail/user_test.c atf_c_detail_user_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la +atf_c_detail_version_helper_SOURCES = atf-c/detail/version_helper.c ATF_CXX_LIBS = libatf-c++.la libatf-c.la libatf_c___la_LIBADD = libatf-c.la libatf_c___la_SOURCES = atf-c++/build.cpp atf-c++/build.hpp \ atf-c++/check.cpp atf-c++/check.hpp atf-c++/config.cpp \ - atf-c++/config.hpp atf-c++/macros.hpp atf-c++/noncopyable.hpp \ - atf-c++/tests.cpp atf-c++/tests.hpp atf-c++/utils.cpp \ - atf-c++/utils.hpp atf-c++/detail/application.cpp \ - atf-c++/detail/application.hpp atf-c++/detail/auto_array.hpp \ - atf-c++/detail/env.cpp atf-c++/detail/env.hpp \ - atf-c++/detail/exceptions.cpp atf-c++/detail/exceptions.hpp \ - atf-c++/detail/expand.cpp atf-c++/detail/expand.hpp \ - atf-c++/detail/fs.cpp atf-c++/detail/fs.hpp \ - atf-c++/detail/parser.cpp atf-c++/detail/parser.hpp \ - atf-c++/detail/process.cpp atf-c++/detail/process.hpp \ - atf-c++/detail/sanity.hpp atf-c++/detail/text.cpp \ - atf-c++/detail/text.hpp atf-c++/detail/ui.cpp \ - atf-c++/detail/ui.hpp -libatf_c___la_LDFLAGS = -version-info 0:0:0 + atf-c++/config.hpp atf-c++/macros.hpp atf-c++/tests.cpp \ + atf-c++/tests.hpp atf-c++/utils.cpp atf-c++/utils.hpp \ + atf-c++/detail/application.cpp atf-c++/detail/application.hpp \ + atf-c++/detail/auto_array.hpp atf-c++/detail/env.cpp \ + atf-c++/detail/env.hpp atf-c++/detail/exceptions.cpp \ + atf-c++/detail/exceptions.hpp atf-c++/detail/fs.cpp \ + atf-c++/detail/fs.hpp atf-c++/detail/process.cpp \ + atf-c++/detail/process.hpp atf-c++/detail/sanity.hpp \ + atf-c++/detail/text.cpp atf-c++/detail/text.hpp +libatf_c___la_LDFLAGS = -version-info 1:0:0 atf_c___HEADERS = atf-c++/build.hpp \ atf-c++/check.hpp \ atf-c++/config.hpp \ atf-c++/macros.hpp \ - atf-c++/noncopyable.hpp \ atf-c++/tests.hpp \ atf-c++/utils.hpp @@ -1723,20 +1659,15 @@ atf_c___detail_env_test_SOURCES = atf-c++/detail/env_test.cpp atf_c___detail_env_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_exceptions_test_SOURCES = atf-c++/detail/exceptions_test.cpp atf_c___detail_exceptions_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -atf_c___detail_expand_test_SOURCES = atf-c++/detail/expand_test.cpp -atf_c___detail_expand_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_fs_test_SOURCES = atf-c++/detail/fs_test.cpp atf_c___detail_fs_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -atf_c___detail_parser_test_SOURCES = atf-c++/detail/parser_test.cpp -atf_c___detail_parser_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_process_test_SOURCES = atf-c++/detail/process_test.cpp atf_c___detail_process_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_sanity_test_SOURCES = atf-c++/detail/sanity_test.cpp atf_c___detail_sanity_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___detail_text_test_SOURCES = atf-c++/detail/text_test.cpp atf_c___detail_text_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -atf_c___detail_ui_test_SOURCES = atf-c++/detail/ui_test.cpp -atf_c___detail_ui_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) +atf_c___detail_version_helper_SOURCES = atf-c++/detail/version_helper.cpp atf_sh_atf_check_SOURCES = atf-sh/atf-check.cpp atf_sh_atf_check_LDADD = $(ATF_CXX_LIBS) atf_sh_atf_sh_SOURCES = atf-sh/atf-sh.cpp @@ -1754,9 +1685,9 @@ tests_atf_sh_SCRIPTS = atf-sh/misc_helpers atf-sh/atf_check_test \ atf-sh/integration_test atf-sh/normalize_test atf-sh/tc_test \ atf-sh/tp_test bootstrap_h_app_empty_SOURCES = bootstrap/h_app_empty.cpp -bootstrap_h_app_empty_LDADD = $(ATF_CXX_LIBS) +bootstrap_h_app_empty_LDADD = tools/libtools.a $(ATF_CXX_LIBS) bootstrap_h_app_opts_args_SOURCES = bootstrap/h_app_opts_args.cpp -bootstrap_h_app_opts_args_LDADD = $(ATF_CXX_LIBS) +bootstrap_h_app_opts_args_LDADD = tools/libtools.a $(ATF_CXX_LIBS) bootstrap_h_tp_basic_c_SOURCES = bootstrap/h_tp_basic_c.c bootstrap_h_tp_basic_c_LDADD = libatf-c.la bootstrap_h_tp_basic_cpp_SOURCES = bootstrap/h_tp_basic_cpp.cpp @@ -1791,128 +1722,166 @@ tests_test_programs_SCRIPTS = test-programs/sh_helpers \ test-programs/config_test test-programs/expect_test \ test-programs/meta_data_test test-programs/result_test \ test-programs/srcdir_test -@ENABLE_TOOLS_TRUE@atf_report_atf_report_SOURCES = atf-report/atf-report.cpp \ -@ENABLE_TOOLS_TRUE@ atf-report/reader.cpp \ -@ENABLE_TOOLS_TRUE@ atf-report/reader.hpp +@ENABLE_TOOLS_TRUE@TOOLS_CPPFLAGS = -I$(top_srcdir)/tools -I$(top_builddir)/tools +@ENABLE_TOOLS_TRUE@TOOLS_LDADD = tools/libtools.a +@ENABLE_TOOLS_TRUE@noinst_LIBRARIES = tools/libtools.a +@ENABLE_TOOLS_TRUE@tools_libtools_a_SOURCES = tools/application.cpp \ +@ENABLE_TOOLS_TRUE@ tools/application.hpp \ +@ENABLE_TOOLS_TRUE@ tools/atffile.cpp \ +@ENABLE_TOOLS_TRUE@ tools/atffile.hpp \ +@ENABLE_TOOLS_TRUE@ tools/auto_array.hpp \ +@ENABLE_TOOLS_TRUE@ tools/config.cpp \ +@ENABLE_TOOLS_TRUE@ tools/config.hpp \ +@ENABLE_TOOLS_TRUE@ tools/config_file.cpp \ +@ENABLE_TOOLS_TRUE@ tools/config_file.hpp \ +@ENABLE_TOOLS_TRUE@ tools/env.cpp \ +@ENABLE_TOOLS_TRUE@ tools/env.hpp \ +@ENABLE_TOOLS_TRUE@ tools/exceptions.cpp \ +@ENABLE_TOOLS_TRUE@ tools/exceptions.hpp \ +@ENABLE_TOOLS_TRUE@ tools/expand.cpp \ +@ENABLE_TOOLS_TRUE@ tools/expand.hpp \ +@ENABLE_TOOLS_TRUE@ tools/fs.cpp \ +@ENABLE_TOOLS_TRUE@ tools/fs.hpp \ +@ENABLE_TOOLS_TRUE@ tools/io.cpp \ +@ENABLE_TOOLS_TRUE@ tools/io.hpp \ +@ENABLE_TOOLS_TRUE@ tools/parser.cpp \ +@ENABLE_TOOLS_TRUE@ tools/parser.hpp \ +@ENABLE_TOOLS_TRUE@ tools/process.cpp \ +@ENABLE_TOOLS_TRUE@ tools/process.hpp \ +@ENABLE_TOOLS_TRUE@ tools/reader.cpp \ +@ENABLE_TOOLS_TRUE@ tools/reader.hpp \ +@ENABLE_TOOLS_TRUE@ tools/requirements.cpp \ +@ENABLE_TOOLS_TRUE@ tools/requirements.hpp \ +@ENABLE_TOOLS_TRUE@ tools/signals.cpp \ +@ENABLE_TOOLS_TRUE@ tools/signals.hpp \ +@ENABLE_TOOLS_TRUE@ tools/test-program.cpp \ +@ENABLE_TOOLS_TRUE@ tools/test-program.hpp \ +@ENABLE_TOOLS_TRUE@ tools/test_helpers.hpp \ +@ENABLE_TOOLS_TRUE@ tools/text.cpp \ +@ENABLE_TOOLS_TRUE@ tools/text.hpp \ +@ENABLE_TOOLS_TRUE@ tools/timers.cpp \ +@ENABLE_TOOLS_TRUE@ tools/timers.hpp \ +@ENABLE_TOOLS_TRUE@ tools/ui.cpp \ +@ENABLE_TOOLS_TRUE@ tools/ui.hpp \ +@ENABLE_TOOLS_TRUE@ tools/user.cpp \ +@ENABLE_TOOLS_TRUE@ tools/user.hpp -@ENABLE_TOOLS_TRUE@atf_report_atf_report_LDADD = $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@nodist_tools_libtools_a_SOURCES = tools/defs.hpp +@ENABLE_TOOLS_TRUE@tools_libtools_a_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_CONFDIR=\"$(atf_confdir)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_INCLUDEDIR=\"$(includedir)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_LIBDIR=\"$(libdir)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_MACHINE=\"$(atf_machine)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_SHELL=\"$(ATF_SHELL)\"" \ +@ENABLE_TOOLS_TRUE@ "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \ +@ENABLE_TOOLS_TRUE@ $(TOOLS_CPPFLAGS) + +@ENABLE_TOOLS_TRUE@tools_atf_config_SOURCES = tools/atf-config.cpp +@ENABLE_TOOLS_TRUE@tools_atf_config_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_atf_config_LDADD = $(TOOLS_LDADD) +@ENABLE_TOOLS_TRUE@tools_atf_report_SOURCES = tools/atf-report.cpp +@ENABLE_TOOLS_TRUE@tools_atf_report_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_atf_report_LDADD = $(TOOLS_LDADD) +@ENABLE_TOOLS_TRUE@tools_atf_run_CPPFLAGS = $(TOOLS_CPPFLAGS) "-DGDB=\"$(GDB)\"" +@ENABLE_TOOLS_TRUE@tools_atf_run_SOURCES = tools/atf-run.cpp +@ENABLE_TOOLS_TRUE@tools_atf_run_LDADD = $(TOOLS_LDADD) +@ENABLE_TOOLS_TRUE@tools_atf_version_SOURCES = tools/atf-version.cpp +@ENABLE_TOOLS_TRUE@nodist_tools_atf_version_SOURCES = tools/revision.h +@ENABLE_TOOLS_TRUE@tools_atf_version_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_atf_version_LDADD = $(TOOLS_LDADD) @ENABLE_TOOLS_TRUE@cssdir = $(atf_cssdir) -@ENABLE_TOOLS_TRUE@css_DATA = atf-report/tests-results.css +@ENABLE_TOOLS_TRUE@css_DATA = tools/tests-results.css @ENABLE_TOOLS_TRUE@dtddir = $(atf_dtddir) -@ENABLE_TOOLS_TRUE@dtd_DATA = atf-report/tests-results.dtd -@ENABLE_TOOLS_TRUE@xsldir = $(atf_xsldir) -@ENABLE_TOOLS_TRUE@xsl_DATA = atf-report/tests-results.xsl -@ENABLE_TOOLS_TRUE@tests_atf_report_DATA = atf-report/Atffile \ -@ENABLE_TOOLS_TRUE@ atf-report/Kyuafile - -@ENABLE_TOOLS_TRUE@tests_atf_reportdir = $(pkgtestsdir)/atf-report -@ENABLE_TOOLS_TRUE@atf_report_fail_helper_SOURCES = atf-report/fail_helper.cpp -@ENABLE_TOOLS_TRUE@atf_report_fail_helper_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_report_misc_helpers_SOURCES = atf-report/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@atf_report_misc_helpers_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_report_pass_helper_SOURCES = atf-report/pass_helper.cpp -@ENABLE_TOOLS_TRUE@atf_report_pass_helper_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tests_atf_report_SCRIPTS = atf-report/integration_test -@ENABLE_TOOLS_TRUE@atf_report_reader_test_SOURCES = atf-report/reader_test.cpp \ -@ENABLE_TOOLS_TRUE@ atf-report/reader.cpp - -@ENABLE_TOOLS_TRUE@atf_report_reader_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail -@ENABLE_TOOLS_TRUE@atf_report_reader_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_config_atf_config_SOURCES = atf-config/atf-config.cpp -@ENABLE_TOOLS_TRUE@atf_config_atf_config_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tests_atf_config_DATA = atf-config/Atffile \ -@ENABLE_TOOLS_TRUE@ atf-config/Kyuafile - -@ENABLE_TOOLS_TRUE@tests_atf_configdir = $(pkgtestsdir)/atf-config -@ENABLE_TOOLS_TRUE@tests_atf_config_SCRIPTS = atf-config/integration_test -@ENABLE_TOOLS_TRUE@atf_run_atf_run_CPPFLAGS = "-DGDB=\"$(GDB)\"" -@ENABLE_TOOLS_TRUE@atf_run_atf_run_SOURCES = atf-run/atf-run.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/atffile.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/atffile.hpp \ -@ENABLE_TOOLS_TRUE@ atf-run/config.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/config.hpp \ -@ENABLE_TOOLS_TRUE@ atf-run/fs.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/fs.hpp \ -@ENABLE_TOOLS_TRUE@ atf-run/io.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/io.hpp \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements.hpp \ -@ENABLE_TOOLS_TRUE@ atf-run/signals.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/signals.hpp \ -@ENABLE_TOOLS_TRUE@ atf-run/test-program.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/test-program.hpp \ -@ENABLE_TOOLS_TRUE@ atf-run/timer.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/timer.hpp \ -@ENABLE_TOOLS_TRUE@ atf-run/user.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/user.hpp - -@ENABLE_TOOLS_TRUE@atf_run_atf_run_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tests_atf_run_DATA = atf-run/Atffile \ -@ENABLE_TOOLS_TRUE@ atf-run/Kyuafile - -@ENABLE_TOOLS_TRUE@tests_atf_rundir = $(pkgtestsdir)/atf-run -@ENABLE_TOOLS_TRUE@atf_run_atffile_test_SOURCES = atf-run/atffile_test.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/atffile.cpp - -@ENABLE_TOOLS_TRUE@atf_run_atffile_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail -@ENABLE_TOOLS_TRUE@atf_run_atffile_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_bad_metadata_helper_SOURCES = atf-run/bad_metadata_helper.c -@ENABLE_TOOLS_TRUE@atf_run_bad_metadata_helper_LDADD = libatf-c.la -@ENABLE_TOOLS_TRUE@atf_run_config_test_SOURCES = atf-run/config_test.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/config.cpp - -@ENABLE_TOOLS_TRUE@atf_run_config_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail -@ENABLE_TOOLS_TRUE@atf_run_config_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_expect_helpers_SOURCES = atf-run/expect_helpers.c -@ENABLE_TOOLS_TRUE@atf_run_expect_helpers_LDADD = libatf-c.la -@ENABLE_TOOLS_TRUE@atf_run_fs_test_SOURCES = atf-run/fs_test.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/fs.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/user.cpp - -@ENABLE_TOOLS_TRUE@atf_run_fs_test_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_io_test_SOURCES = atf-run/io_test.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/io.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/signals.cpp - -@ENABLE_TOOLS_TRUE@atf_run_io_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_misc_helpers_SOURCES = atf-run/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@atf_run_misc_helpers_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_pass_helper_SOURCES = atf-run/pass_helper.cpp -@ENABLE_TOOLS_TRUE@atf_run_pass_helper_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_several_tcs_helper_SOURCES = atf-run/several_tcs_helper.c -@ENABLE_TOOLS_TRUE@atf_run_several_tcs_helper_LDADD = libatf-c.la -@ENABLE_TOOLS_TRUE@atf_run_requirements_test_SOURCES = atf-run/requirements_test.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/user.cpp - -@ENABLE_TOOLS_TRUE@atf_run_requirements_test_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_signals_test_SOURCES = atf-run/signals_test.cpp atf-run/signals.cpp -@ENABLE_TOOLS_TRUE@atf_run_signals_test_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_test_program_test_SOURCES = atf-run/test_program_test.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/fs.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/io.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/requirements.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/signals.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/test-program.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/timer.cpp \ -@ENABLE_TOOLS_TRUE@ atf-run/user.cpp - -@ENABLE_TOOLS_TRUE@atf_run_test_program_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail -@ENABLE_TOOLS_TRUE@atf_run_test_program_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_user_test_SOURCES = atf-run/user_test.cpp atf-run/user.cpp -@ENABLE_TOOLS_TRUE@atf_run_user_test_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@atf_run_zero_tcs_helper_SOURCES = atf-run/zero_tcs_helper.c -@ENABLE_TOOLS_TRUE@atf_run_zero_tcs_helper_LDADD = libatf-c.la -@ENABLE_TOOLS_TRUE@tests_atf_run_SCRIPTS = atf-run/integration_test -@ENABLE_TOOLS_TRUE@hooksdir = $(pkgdatadir) -@ENABLE_TOOLS_TRUE@hooks_DATA = atf-run/share/atf-run.hooks +@ENABLE_TOOLS_TRUE@dtd_DATA = tools/tests-results.dtd @ENABLE_TOOLS_TRUE@egdir = $(atf_egdir) -@ENABLE_TOOLS_TRUE@eg_DATA = atf-run/sample/atf-run.hooks \ -@ENABLE_TOOLS_TRUE@ atf-run/sample/common.conf -@ENABLE_TOOLS_TRUE@atf_version_atf_version_SOURCES = atf-version/atf-version.cpp -@ENABLE_TOOLS_TRUE@nodist_atf_version_atf_version_SOURCES = atf-version/revision.h -@ENABLE_TOOLS_TRUE@atf_version_atf_version_CPPFLAGS = -Iatf-version -@ENABLE_TOOLS_TRUE@atf_version_atf_version_LDADD = $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@eg_DATA = tools/sample/atf-run.hooks \ +@ENABLE_TOOLS_TRUE@ tools/sample/common.conf +@ENABLE_TOOLS_TRUE@hooksdir = $(pkgdatadir) +@ENABLE_TOOLS_TRUE@hooks_DATA = tools/share/atf-run.hooks +@ENABLE_TOOLS_TRUE@xsldir = $(atf_xsldir) +@ENABLE_TOOLS_TRUE@xsl_DATA = tools/tests-results.xsl +@ENABLE_TOOLS_TRUE@tests_tools_DATA = tools/Atffile tools/Kyuafile +@ENABLE_TOOLS_TRUE@tests_toolsdir = $(pkgtestsdir)/tools +@ENABLE_TOOLS_TRUE@tests_tools_SCRIPTS = tools/atf-config_test \ +@ENABLE_TOOLS_TRUE@ tools/atf-report_test tools/atf-run_test +@ENABLE_TOOLS_TRUE@tools_application_test_SOURCES = tools/application_test.cpp +@ENABLE_TOOLS_TRUE@tools_application_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_application_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_atffile_test_SOURCES = tools/atffile_test.cpp +@ENABLE_TOOLS_TRUE@tools_atffile_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_atffile_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_auto_array_test_SOURCES = tools/auto_array_test.cpp +@ENABLE_TOOLS_TRUE@tools_auto_array_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_auto_array_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_SOURCES = tools/bad_metadata_helper.c +@ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_LDADD = libatf-c.la +@ENABLE_TOOLS_TRUE@tools_config_test_SOURCES = tools/config_test.cpp +@ENABLE_TOOLS_TRUE@tools_config_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_config_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_config_file_test_SOURCES = tools/config_file_test.cpp +@ENABLE_TOOLS_TRUE@tools_config_file_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_config_file_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_env_test_SOURCES = tools/env_test.cpp +@ENABLE_TOOLS_TRUE@tools_env_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_env_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_expand_test_SOURCES = tools/expand_test.cpp +@ENABLE_TOOLS_TRUE@tools_expand_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_expand_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_expect_helpers_SOURCES = tools/expect_helpers.c +@ENABLE_TOOLS_TRUE@tools_expect_helpers_LDADD = libatf-c.la +@ENABLE_TOOLS_TRUE@tools_fail_helper_SOURCES = tools/fail_helper.cpp +@ENABLE_TOOLS_TRUE@tools_fail_helper_LDADD = $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_fs_test_SOURCES = tools/fs_test.cpp +@ENABLE_TOOLS_TRUE@tools_fs_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_fs_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_io_test_SOURCES = tools/io_test.cpp +@ENABLE_TOOLS_TRUE@tools_io_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_io_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_misc_helpers_SOURCES = tools/misc_helpers.cpp +@ENABLE_TOOLS_TRUE@tools_misc_helpers_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_misc_helpers_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_parser_test_SOURCES = tools/parser_test.cpp +@ENABLE_TOOLS_TRUE@tools_parser_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_parser_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_process_test_SOURCES = tools/process_test.cpp +@ENABLE_TOOLS_TRUE@tools_process_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_process_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_pass_helper_SOURCES = tools/pass_helper.cpp +@ENABLE_TOOLS_TRUE@tools_pass_helper_LDADD = $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_process_helpers_SOURCES = tools/process_helpers.c +@ENABLE_TOOLS_TRUE@tools_reader_test_SOURCES = tools/reader_test.cpp +@ENABLE_TOOLS_TRUE@tools_reader_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_reader_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_requirements_test_SOURCES = tools/requirements_test.cpp +@ENABLE_TOOLS_TRUE@tools_requirements_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_requirements_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_several_tcs_helper_SOURCES = tools/several_tcs_helper.c +@ENABLE_TOOLS_TRUE@tools_several_tcs_helper_LDADD = libatf-c.la +@ENABLE_TOOLS_TRUE@tools_signals_test_SOURCES = tools/signals_test.cpp tools/signals.cpp +@ENABLE_TOOLS_TRUE@tools_signals_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_signals_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_test_program_test_SOURCES = tools/test_program_test.cpp +@ENABLE_TOOLS_TRUE@tools_test_program_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_test_program_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_text_test_SOURCES = tools/text_test.cpp tools/text.cpp +@ENABLE_TOOLS_TRUE@tools_text_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_text_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_ui_test_SOURCES = tools/ui_test.cpp tools/ui.cpp +@ENABLE_TOOLS_TRUE@tools_ui_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_ui_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_user_test_SOURCES = tools/user_test.cpp tools/user.cpp +@ENABLE_TOOLS_TRUE@tools_user_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +@ENABLE_TOOLS_TRUE@tools_user_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) +@ENABLE_TOOLS_TRUE@tools_zero_tcs_helper_SOURCES = tools/zero_tcs_helper.c +@ENABLE_TOOLS_TRUE@tools_zero_tcs_helper_LDADD = libatf-c.la # # Top-level distfile documents. @@ -1927,7 +1896,7 @@ TESTS_ENVIRONMENT = PATH=$(prefix)/bin:$${PATH} \ testsdir = $(exec_prefix)/tests pkgtestsdir = $(testsdir)/$(PACKAGE) -pkgtests_DATA = Kyuafile $(am__append_12) +pkgtests_DATA = Kyuafile $(am__append_11) BUILD_SH_TP = \ echo "Creating $${dst}"; \ echo "\#! $(bindir)/atf-sh" >$${dst}; \ @@ -1941,7 +1910,7 @@ all: $(BUILT_SOURCES) bconfig.h .SUFFIXES: .c .cpp .lo .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/atf-report/Makefile.am.inc $(srcdir)/atf-config/Makefile.am.inc $(srcdir)/atf-run/Makefile.am.inc $(srcdir)/atf-version/Makefile.am.inc $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/tools/Makefile.am.inc $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1964,7 +1933,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/atf-report/Makefile.am.inc $(srcdir)/atf-config/Makefile.am.inc $(srcdir)/atf-run/Makefile.am.inc $(srcdir)/atf-version/Makefile.am.inc: +$(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/tools/Makefile.am.inc: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1991,6 +1960,60 @@ distclean-hdr: -rm -f bconfig.h stamp-h1 atf-c/defs.h: $(top_builddir)/config.status $(top_srcdir)/atf-c/defs.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ +tools/defs.hpp: $(top_builddir)/config.status $(top_srcdir)/tools/defs.hpp.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +tools/$(am__dirstamp): + @$(MKDIR_P) tools + @: > tools/$(am__dirstamp) +tools/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) tools/$(DEPDIR) + @: > tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-application.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-atffile.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-config.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-config_file.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-env.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-exceptions.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-expand.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-fs.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-io.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-parser.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-process.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-reader.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-requirements.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-signals.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-test-program.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-text.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-timers.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-ui.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_libtools_a-user.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/libtools.a: $(tools_libtools_a_OBJECTS) $(tools_libtools_a_DEPENDENCIES) $(EXTRA_tools_libtools_a_DEPENDENCIES) tools/$(am__dirstamp) + $(AM_V_at)-rm -f tools/libtools.a + $(AM_V_AR)$(tools_libtools_a_AR) tools/libtools.a $(tools_libtools_a_OBJECTS) $(tools_libtools_a_LIBADD) + $(AM_V_at)$(RANLIB) tools/libtools.a install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -2082,18 +2105,12 @@ atf-c++/detail/env.lo: atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) atf-c++/detail/exceptions.lo: atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) -atf-c++/detail/expand.lo: atf-c++/detail/$(am__dirstamp) \ - atf-c++/detail/$(DEPDIR)/$(am__dirstamp) atf-c++/detail/fs.lo: atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) -atf-c++/detail/parser.lo: atf-c++/detail/$(am__dirstamp) \ - atf-c++/detail/$(DEPDIR)/$(am__dirstamp) atf-c++/detail/process.lo: atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) atf-c++/detail/text.lo: atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) -atf-c++/detail/ui.lo: atf-c++/detail/$(am__dirstamp) \ - atf-c++/detail/$(DEPDIR)/$(am__dirstamp) libatf-c++.la: $(libatf_c___la_OBJECTS) $(libatf_c___la_DEPENDENCIES) $(EXTRA_libatf_c___la_DEPENDENCIES) $(AM_V_CXXLD)$(libatf_c___la_LINK) -rpath $(libdir) $(libatf_c___la_OBJECTS) $(libatf_c___la_LIBADD) $(LIBS) @@ -2443,104 +2460,6 @@ clean-tests_atf_c_detailPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -install-tests_atf_reportPROGRAMS: $(tests_atf_report_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(tests_atf_report_PROGRAMS)'; test -n "$(tests_atf_reportdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_atf_reportdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_atf_reportdir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_atf_reportdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_atf_reportdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-tests_atf_reportPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(tests_atf_report_PROGRAMS)'; test -n "$(tests_atf_reportdir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(tests_atf_reportdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(tests_atf_reportdir)" && rm -f $$files - -clean-tests_atf_reportPROGRAMS: - @list='$(tests_atf_report_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -install-tests_atf_runPROGRAMS: $(tests_atf_run_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(tests_atf_run_PROGRAMS)'; test -n "$(tests_atf_rundir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_atf_rundir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_atf_rundir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_atf_rundir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_atf_rundir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-tests_atf_runPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(tests_atf_run_PROGRAMS)'; test -n "$(tests_atf_rundir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(tests_atf_rundir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(tests_atf_rundir)" && rm -f $$files - -clean-tests_atf_runPROGRAMS: - @list='$(tests_atf_run_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list install-tests_test_programsPROGRAMS: $(tests_test_programs_PROGRAMS) @$(NORMAL_INSTALL) @list='$(tests_test_programs_PROGRAMS)'; test -n "$(tests_test_programsdir)" || list=; \ @@ -2590,6 +2509,55 @@ clean-tests_test_programsPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list +install-tests_toolsPROGRAMS: $(tests_tools_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(tests_tools_PROGRAMS)'; test -n "$(tests_toolsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tests_toolsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tests_toolsdir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_toolsdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_toolsdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-tests_toolsPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(tests_tools_PROGRAMS)'; test -n "$(tests_toolsdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(tests_toolsdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(tests_toolsdir)" && rm -f $$files + +clean-tests_toolsPROGRAMS: + @list='$(tests_tools_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list atf-c++/atf_c++_test.$(OBJEXT): atf-c++/$(am__dirstamp) \ atf-c++/$(DEPDIR)/$(am__dirstamp) @@ -2641,24 +2609,12 @@ atf-c++/detail/exceptions_test.$(OBJEXT): \ atf-c++/detail/exceptions_test$(EXEEXT): $(atf_c___detail_exceptions_test_OBJECTS) $(atf_c___detail_exceptions_test_DEPENDENCIES) $(EXTRA_atf_c___detail_exceptions_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) @rm -f atf-c++/detail/exceptions_test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_exceptions_test_OBJECTS) $(atf_c___detail_exceptions_test_LDADD) $(LIBS) -atf-c++/detail/expand_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \ - atf-c++/detail/$(DEPDIR)/$(am__dirstamp) - -atf-c++/detail/expand_test$(EXEEXT): $(atf_c___detail_expand_test_OBJECTS) $(atf_c___detail_expand_test_DEPENDENCIES) $(EXTRA_atf_c___detail_expand_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) - @rm -f atf-c++/detail/expand_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_expand_test_OBJECTS) $(atf_c___detail_expand_test_LDADD) $(LIBS) atf-c++/detail/fs_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) atf-c++/detail/fs_test$(EXEEXT): $(atf_c___detail_fs_test_OBJECTS) $(atf_c___detail_fs_test_DEPENDENCIES) $(EXTRA_atf_c___detail_fs_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) @rm -f atf-c++/detail/fs_test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_fs_test_OBJECTS) $(atf_c___detail_fs_test_LDADD) $(LIBS) -atf-c++/detail/parser_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \ - atf-c++/detail/$(DEPDIR)/$(am__dirstamp) - -atf-c++/detail/parser_test$(EXEEXT): $(atf_c___detail_parser_test_OBJECTS) $(atf_c___detail_parser_test_DEPENDENCIES) $(EXTRA_atf_c___detail_parser_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) - @rm -f atf-c++/detail/parser_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_parser_test_OBJECTS) $(atf_c___detail_parser_test_LDADD) $(LIBS) atf-c++/detail/process_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) @@ -2677,12 +2633,13 @@ atf-c++/detail/text_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/text_test$(EXEEXT): $(atf_c___detail_text_test_OBJECTS) $(atf_c___detail_text_test_DEPENDENCIES) $(EXTRA_atf_c___detail_text_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) @rm -f atf-c++/detail/text_test$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_text_test_OBJECTS) $(atf_c___detail_text_test_LDADD) $(LIBS) -atf-c++/detail/ui_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \ +atf-c++/detail/version_helper.$(OBJEXT): \ + atf-c++/detail/$(am__dirstamp) \ atf-c++/detail/$(DEPDIR)/$(am__dirstamp) -atf-c++/detail/ui_test$(EXEEXT): $(atf_c___detail_ui_test_OBJECTS) $(atf_c___detail_ui_test_DEPENDENCIES) $(EXTRA_atf_c___detail_ui_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) - @rm -f atf-c++/detail/ui_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_ui_test_OBJECTS) $(atf_c___detail_ui_test_LDADD) $(LIBS) +atf-c++/detail/version_helper$(EXEEXT): $(atf_c___detail_version_helper_OBJECTS) $(atf_c___detail_version_helper_DEPENDENCIES) $(EXTRA_atf_c___detail_version_helper_DEPENDENCIES) atf-c++/detail/$(am__dirstamp) + @rm -f atf-c++/detail/version_helper$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(atf_c___detail_version_helper_OBJECTS) $(atf_c___detail_version_helper_LDADD) $(LIBS) atf-c++/macros_test.$(OBJEXT): atf-c++/$(am__dirstamp) \ atf-c++/$(DEPDIR)/$(am__dirstamp) @@ -2785,6 +2742,12 @@ atf-c/detail/user_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \ atf-c/detail/user_test$(EXEEXT): $(atf_c_detail_user_test_OBJECTS) $(atf_c_detail_user_test_DEPENDENCIES) $(EXTRA_atf_c_detail_user_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp) @rm -f atf-c/detail/user_test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(atf_c_detail_user_test_OBJECTS) $(atf_c_detail_user_test_LDADD) $(LIBS) +atf-c/detail/version_helper.$(OBJEXT): atf-c/detail/$(am__dirstamp) \ + atf-c/detail/$(DEPDIR)/$(am__dirstamp) + +atf-c/detail/version_helper$(EXEEXT): $(atf_c_detail_version_helper_OBJECTS) $(atf_c_detail_version_helper_DEPENDENCIES) $(EXTRA_atf_c_detail_version_helper_DEPENDENCIES) atf-c/detail/$(am__dirstamp) + @rm -f atf-c/detail/version_helper$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(atf_c_detail_version_helper_OBJECTS) $(atf_c_detail_version_helper_LDADD) $(LIBS) atf-c/error_test.$(OBJEXT): atf-c/$(am__dirstamp) \ atf-c/$(DEPDIR)/$(am__dirstamp) @@ -2815,202 +2778,6 @@ atf-c/utils_test.$(OBJEXT): atf-c/$(am__dirstamp) \ atf-c/utils_test$(EXEEXT): $(atf_c_utils_test_OBJECTS) $(atf_c_utils_test_DEPENDENCIES) $(EXTRA_atf_c_utils_test_DEPENDENCIES) atf-c/$(am__dirstamp) @rm -f atf-c/utils_test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(atf_c_utils_test_OBJECTS) $(atf_c_utils_test_LDADD) $(LIBS) -atf-config/$(am__dirstamp): - @$(MKDIR_P) atf-config - @: > atf-config/$(am__dirstamp) -atf-config/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) atf-config/$(DEPDIR) - @: > atf-config/$(DEPDIR)/$(am__dirstamp) -atf-config/atf-config.$(OBJEXT): atf-config/$(am__dirstamp) \ - atf-config/$(DEPDIR)/$(am__dirstamp) - -atf-config/atf-config$(EXEEXT): $(atf_config_atf_config_OBJECTS) $(atf_config_atf_config_DEPENDENCIES) $(EXTRA_atf_config_atf_config_DEPENDENCIES) atf-config/$(am__dirstamp) - @rm -f atf-config/atf-config$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_config_atf_config_OBJECTS) $(atf_config_atf_config_LDADD) $(LIBS) -atf-report/$(am__dirstamp): - @$(MKDIR_P) atf-report - @: > atf-report/$(am__dirstamp) -atf-report/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) atf-report/$(DEPDIR) - @: > atf-report/$(DEPDIR)/$(am__dirstamp) -atf-report/atf-report.$(OBJEXT): atf-report/$(am__dirstamp) \ - atf-report/$(DEPDIR)/$(am__dirstamp) -atf-report/reader.$(OBJEXT): atf-report/$(am__dirstamp) \ - atf-report/$(DEPDIR)/$(am__dirstamp) - -atf-report/atf-report$(EXEEXT): $(atf_report_atf_report_OBJECTS) $(atf_report_atf_report_DEPENDENCIES) $(EXTRA_atf_report_atf_report_DEPENDENCIES) atf-report/$(am__dirstamp) - @rm -f atf-report/atf-report$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_report_atf_report_OBJECTS) $(atf_report_atf_report_LDADD) $(LIBS) -atf-report/fail_helper.$(OBJEXT): atf-report/$(am__dirstamp) \ - atf-report/$(DEPDIR)/$(am__dirstamp) - -atf-report/fail_helper$(EXEEXT): $(atf_report_fail_helper_OBJECTS) $(atf_report_fail_helper_DEPENDENCIES) $(EXTRA_atf_report_fail_helper_DEPENDENCIES) atf-report/$(am__dirstamp) - @rm -f atf-report/fail_helper$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_report_fail_helper_OBJECTS) $(atf_report_fail_helper_LDADD) $(LIBS) -atf-report/misc_helpers.$(OBJEXT): atf-report/$(am__dirstamp) \ - atf-report/$(DEPDIR)/$(am__dirstamp) - -atf-report/misc_helpers$(EXEEXT): $(atf_report_misc_helpers_OBJECTS) $(atf_report_misc_helpers_DEPENDENCIES) $(EXTRA_atf_report_misc_helpers_DEPENDENCIES) atf-report/$(am__dirstamp) - @rm -f atf-report/misc_helpers$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_report_misc_helpers_OBJECTS) $(atf_report_misc_helpers_LDADD) $(LIBS) -atf-report/pass_helper.$(OBJEXT): atf-report/$(am__dirstamp) \ - atf-report/$(DEPDIR)/$(am__dirstamp) - -atf-report/pass_helper$(EXEEXT): $(atf_report_pass_helper_OBJECTS) $(atf_report_pass_helper_DEPENDENCIES) $(EXTRA_atf_report_pass_helper_DEPENDENCIES) atf-report/$(am__dirstamp) - @rm -f atf-report/pass_helper$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_report_pass_helper_OBJECTS) $(atf_report_pass_helper_LDADD) $(LIBS) -atf-report/atf_report_reader_test-reader_test.$(OBJEXT): \ - atf-report/$(am__dirstamp) \ - atf-report/$(DEPDIR)/$(am__dirstamp) -atf-report/atf_report_reader_test-reader.$(OBJEXT): \ - atf-report/$(am__dirstamp) \ - atf-report/$(DEPDIR)/$(am__dirstamp) - -atf-report/reader_test$(EXEEXT): $(atf_report_reader_test_OBJECTS) $(atf_report_reader_test_DEPENDENCIES) $(EXTRA_atf_report_reader_test_DEPENDENCIES) atf-report/$(am__dirstamp) - @rm -f atf-report/reader_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_report_reader_test_OBJECTS) $(atf_report_reader_test_LDADD) $(LIBS) -atf-run/$(am__dirstamp): - @$(MKDIR_P) atf-run - @: > atf-run/$(am__dirstamp) -atf-run/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) atf-run/$(DEPDIR) - @: > atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-atf-run.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-atffile.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-config.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-fs.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-io.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-requirements.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-signals.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-test-program.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-timer.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atf_run-user.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/atf-run$(EXEEXT): $(atf_run_atf_run_OBJECTS) $(atf_run_atf_run_DEPENDENCIES) $(EXTRA_atf_run_atf_run_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/atf-run$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_atf_run_OBJECTS) $(atf_run_atf_run_LDADD) $(LIBS) -atf-run/atf_run_atffile_test-atffile_test.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_atffile_test-atffile.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/atffile_test$(EXEEXT): $(atf_run_atffile_test_OBJECTS) $(atf_run_atffile_test_DEPENDENCIES) $(EXTRA_atf_run_atffile_test_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/atffile_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_atffile_test_OBJECTS) $(atf_run_atffile_test_LDADD) $(LIBS) -atf-run/bad_metadata_helper.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/bad_metadata_helper$(EXEEXT): $(atf_run_bad_metadata_helper_OBJECTS) $(atf_run_bad_metadata_helper_DEPENDENCIES) $(EXTRA_atf_run_bad_metadata_helper_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/bad_metadata_helper$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(atf_run_bad_metadata_helper_OBJECTS) $(atf_run_bad_metadata_helper_LDADD) $(LIBS) -atf-run/atf_run_config_test-config_test.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_config_test-config.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/config_test$(EXEEXT): $(atf_run_config_test_OBJECTS) $(atf_run_config_test_DEPENDENCIES) $(EXTRA_atf_run_config_test_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/config_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_config_test_OBJECTS) $(atf_run_config_test_LDADD) $(LIBS) -atf-run/expect_helpers.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/expect_helpers$(EXEEXT): $(atf_run_expect_helpers_OBJECTS) $(atf_run_expect_helpers_DEPENDENCIES) $(EXTRA_atf_run_expect_helpers_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/expect_helpers$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(atf_run_expect_helpers_OBJECTS) $(atf_run_expect_helpers_LDADD) $(LIBS) -atf-run/fs_test.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/fs.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/user.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/fs_test$(EXEEXT): $(atf_run_fs_test_OBJECTS) $(atf_run_fs_test_DEPENDENCIES) $(EXTRA_atf_run_fs_test_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/fs_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_fs_test_OBJECTS) $(atf_run_fs_test_LDADD) $(LIBS) -atf-run/io_test.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/io.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/signals.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/io_test$(EXEEXT): $(atf_run_io_test_OBJECTS) $(atf_run_io_test_DEPENDENCIES) $(EXTRA_atf_run_io_test_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/io_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_io_test_OBJECTS) $(atf_run_io_test_LDADD) $(LIBS) -atf-run/misc_helpers.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/misc_helpers$(EXEEXT): $(atf_run_misc_helpers_OBJECTS) $(atf_run_misc_helpers_DEPENDENCIES) $(EXTRA_atf_run_misc_helpers_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/misc_helpers$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_misc_helpers_OBJECTS) $(atf_run_misc_helpers_LDADD) $(LIBS) -atf-run/pass_helper.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/pass_helper$(EXEEXT): $(atf_run_pass_helper_OBJECTS) $(atf_run_pass_helper_DEPENDENCIES) $(EXTRA_atf_run_pass_helper_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/pass_helper$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_pass_helper_OBJECTS) $(atf_run_pass_helper_LDADD) $(LIBS) -atf-run/requirements_test.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/requirements.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/requirements_test$(EXEEXT): $(atf_run_requirements_test_OBJECTS) $(atf_run_requirements_test_DEPENDENCIES) $(EXTRA_atf_run_requirements_test_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/requirements_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_requirements_test_OBJECTS) $(atf_run_requirements_test_LDADD) $(LIBS) -atf-run/several_tcs_helper.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/several_tcs_helper$(EXEEXT): $(atf_run_several_tcs_helper_OBJECTS) $(atf_run_several_tcs_helper_DEPENDENCIES) $(EXTRA_atf_run_several_tcs_helper_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/several_tcs_helper$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(atf_run_several_tcs_helper_OBJECTS) $(atf_run_several_tcs_helper_LDADD) $(LIBS) -atf-run/signals_test.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/signals_test$(EXEEXT): $(atf_run_signals_test_OBJECTS) $(atf_run_signals_test_DEPENDENCIES) $(EXTRA_atf_run_signals_test_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/signals_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_signals_test_OBJECTS) $(atf_run_signals_test_LDADD) $(LIBS) -atf-run/atf_run_test_program_test-test_program_test.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_test_program_test-fs.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_test_program_test-io.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_test_program_test-requirements.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_test_program_test-signals.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_test_program_test-test-program.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_test_program_test-timer.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) -atf-run/atf_run_test_program_test-user.$(OBJEXT): \ - atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/test_program_test$(EXEEXT): $(atf_run_test_program_test_OBJECTS) $(atf_run_test_program_test_DEPENDENCIES) $(EXTRA_atf_run_test_program_test_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/test_program_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_test_program_test_OBJECTS) $(atf_run_test_program_test_LDADD) $(LIBS) -atf-run/user_test.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/user_test$(EXEEXT): $(atf_run_user_test_OBJECTS) $(atf_run_user_test_DEPENDENCIES) $(EXTRA_atf_run_user_test_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/user_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_run_user_test_OBJECTS) $(atf_run_user_test_LDADD) $(LIBS) -atf-run/zero_tcs_helper.$(OBJEXT): atf-run/$(am__dirstamp) \ - atf-run/$(DEPDIR)/$(am__dirstamp) - -atf-run/zero_tcs_helper$(EXEEXT): $(atf_run_zero_tcs_helper_OBJECTS) $(atf_run_zero_tcs_helper_DEPENDENCIES) $(EXTRA_atf_run_zero_tcs_helper_DEPENDENCIES) atf-run/$(am__dirstamp) - @rm -f atf-run/zero_tcs_helper$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(atf_run_zero_tcs_helper_OBJECTS) $(atf_run_zero_tcs_helper_LDADD) $(LIBS) atf-sh/$(am__dirstamp): @$(MKDIR_P) atf-sh @: > atf-sh/$(am__dirstamp) @@ -3029,19 +2796,6 @@ atf-sh/atf-sh.$(OBJEXT): atf-sh/$(am__dirstamp) \ atf-sh/atf-sh$(EXEEXT): $(atf_sh_atf_sh_OBJECTS) $(atf_sh_atf_sh_DEPENDENCIES) $(EXTRA_atf_sh_atf_sh_DEPENDENCIES) atf-sh/$(am__dirstamp) @rm -f atf-sh/atf-sh$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(atf_sh_atf_sh_OBJECTS) $(atf_sh_atf_sh_LDADD) $(LIBS) -atf-version/$(am__dirstamp): - @$(MKDIR_P) atf-version - @: > atf-version/$(am__dirstamp) -atf-version/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) atf-version/$(DEPDIR) - @: > atf-version/$(DEPDIR)/$(am__dirstamp) -atf-version/atf_version_atf_version-atf-version.$(OBJEXT): \ - atf-version/$(am__dirstamp) \ - atf-version/$(DEPDIR)/$(am__dirstamp) - -atf-version/atf-version$(EXEEXT): $(atf_version_atf_version_OBJECTS) $(atf_version_atf_version_DEPENDENCIES) $(EXTRA_atf_version_atf_version_DEPENDENCIES) atf-version/$(am__dirstamp) - @rm -f atf-version/atf-version$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(atf_version_atf_version_OBJECTS) $(atf_version_atf_version_LDADD) $(LIBS) bootstrap/$(am__dirstamp): @$(MKDIR_P) bootstrap @: > bootstrap/$(am__dirstamp) @@ -3090,6 +2844,194 @@ test-programs/cpp_helpers.$(OBJEXT): test-programs/$(am__dirstamp) \ test-programs/cpp_helpers$(EXEEXT): $(test_programs_cpp_helpers_OBJECTS) $(test_programs_cpp_helpers_DEPENDENCIES) $(EXTRA_test_programs_cpp_helpers_DEPENDENCIES) test-programs/$(am__dirstamp) @rm -f test-programs/cpp_helpers$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(test_programs_cpp_helpers_OBJECTS) $(test_programs_cpp_helpers_LDADD) $(LIBS) +tools/tools_application_test-application_test.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + +tools/application_test$(EXEEXT): $(tools_application_test_OBJECTS) $(tools_application_test_DEPENDENCIES) $(EXTRA_tools_application_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/application_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_application_test_OBJECTS) $(tools_application_test_LDADD) $(LIBS) +tools/tools_atf_config-atf-config.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/atf-config$(EXEEXT): $(tools_atf_config_OBJECTS) $(tools_atf_config_DEPENDENCIES) $(EXTRA_tools_atf_config_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/atf-config$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_atf_config_OBJECTS) $(tools_atf_config_LDADD) $(LIBS) +tools/tools_atf_report-atf-report.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/atf-report$(EXEEXT): $(tools_atf_report_OBJECTS) $(tools_atf_report_DEPENDENCIES) $(EXTRA_tools_atf_report_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/atf-report$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_atf_report_OBJECTS) $(tools_atf_report_LDADD) $(LIBS) +tools/tools_atf_run-atf-run.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/atf-run$(EXEEXT): $(tools_atf_run_OBJECTS) $(tools_atf_run_DEPENDENCIES) $(EXTRA_tools_atf_run_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/atf-run$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_atf_run_OBJECTS) $(tools_atf_run_LDADD) $(LIBS) +tools/tools_atf_version-atf-version.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/atf-version$(EXEEXT): $(tools_atf_version_OBJECTS) $(tools_atf_version_DEPENDENCIES) $(EXTRA_tools_atf_version_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/atf-version$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_atf_version_OBJECTS) $(tools_atf_version_LDADD) $(LIBS) +tools/tools_atffile_test-atffile_test.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + +tools/atffile_test$(EXEEXT): $(tools_atffile_test_OBJECTS) $(tools_atffile_test_DEPENDENCIES) $(EXTRA_tools_atffile_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/atffile_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_atffile_test_OBJECTS) $(tools_atffile_test_LDADD) $(LIBS) +tools/tools_auto_array_test-auto_array_test.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + +tools/auto_array_test$(EXEEXT): $(tools_auto_array_test_OBJECTS) $(tools_auto_array_test_DEPENDENCIES) $(EXTRA_tools_auto_array_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/auto_array_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_auto_array_test_OBJECTS) $(tools_auto_array_test_LDADD) $(LIBS) +tools/bad_metadata_helper.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/bad_metadata_helper$(EXEEXT): $(tools_bad_metadata_helper_OBJECTS) $(tools_bad_metadata_helper_DEPENDENCIES) $(EXTRA_tools_bad_metadata_helper_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/bad_metadata_helper$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(tools_bad_metadata_helper_OBJECTS) $(tools_bad_metadata_helper_LDADD) $(LIBS) +tools/tools_config_file_test-config_file_test.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + +tools/config_file_test$(EXEEXT): $(tools_config_file_test_OBJECTS) $(tools_config_file_test_DEPENDENCIES) $(EXTRA_tools_config_file_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/config_file_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_config_file_test_OBJECTS) $(tools_config_file_test_LDADD) $(LIBS) +tools/tools_config_test-config_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/config_test$(EXEEXT): $(tools_config_test_OBJECTS) $(tools_config_test_DEPENDENCIES) $(EXTRA_tools_config_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/config_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_config_test_OBJECTS) $(tools_config_test_LDADD) $(LIBS) +tools/tools_env_test-env_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/env_test$(EXEEXT): $(tools_env_test_OBJECTS) $(tools_env_test_DEPENDENCIES) $(EXTRA_tools_env_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/env_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_env_test_OBJECTS) $(tools_env_test_LDADD) $(LIBS) +tools/tools_expand_test-expand_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/expand_test$(EXEEXT): $(tools_expand_test_OBJECTS) $(tools_expand_test_DEPENDENCIES) $(EXTRA_tools_expand_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/expand_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_expand_test_OBJECTS) $(tools_expand_test_LDADD) $(LIBS) +tools/expect_helpers.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/expect_helpers$(EXEEXT): $(tools_expect_helpers_OBJECTS) $(tools_expect_helpers_DEPENDENCIES) $(EXTRA_tools_expect_helpers_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/expect_helpers$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(tools_expect_helpers_OBJECTS) $(tools_expect_helpers_LDADD) $(LIBS) +tools/fail_helper.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/fail_helper$(EXEEXT): $(tools_fail_helper_OBJECTS) $(tools_fail_helper_DEPENDENCIES) $(EXTRA_tools_fail_helper_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/fail_helper$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_fail_helper_OBJECTS) $(tools_fail_helper_LDADD) $(LIBS) +tools/tools_fs_test-fs_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/fs_test$(EXEEXT): $(tools_fs_test_OBJECTS) $(tools_fs_test_DEPENDENCIES) $(EXTRA_tools_fs_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/fs_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_fs_test_OBJECTS) $(tools_fs_test_LDADD) $(LIBS) +tools/tools_io_test-io_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/io_test$(EXEEXT): $(tools_io_test_OBJECTS) $(tools_io_test_DEPENDENCIES) $(EXTRA_tools_io_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/io_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_io_test_OBJECTS) $(tools_io_test_LDADD) $(LIBS) +tools/tools_misc_helpers-misc_helpers.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + +tools/misc_helpers$(EXEEXT): $(tools_misc_helpers_OBJECTS) $(tools_misc_helpers_DEPENDENCIES) $(EXTRA_tools_misc_helpers_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/misc_helpers$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_misc_helpers_OBJECTS) $(tools_misc_helpers_LDADD) $(LIBS) +tools/tools_parser_test-parser_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/parser_test$(EXEEXT): $(tools_parser_test_OBJECTS) $(tools_parser_test_DEPENDENCIES) $(EXTRA_tools_parser_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/parser_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_parser_test_OBJECTS) $(tools_parser_test_LDADD) $(LIBS) +tools/pass_helper.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/pass_helper$(EXEEXT): $(tools_pass_helper_OBJECTS) $(tools_pass_helper_DEPENDENCIES) $(EXTRA_tools_pass_helper_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/pass_helper$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_pass_helper_OBJECTS) $(tools_pass_helper_LDADD) $(LIBS) +tools/process_helpers.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/process_helpers$(EXEEXT): $(tools_process_helpers_OBJECTS) $(tools_process_helpers_DEPENDENCIES) $(EXTRA_tools_process_helpers_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/process_helpers$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(tools_process_helpers_OBJECTS) $(tools_process_helpers_LDADD) $(LIBS) +tools/tools_process_test-process_test.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + +tools/process_test$(EXEEXT): $(tools_process_test_OBJECTS) $(tools_process_test_DEPENDENCIES) $(EXTRA_tools_process_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/process_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_process_test_OBJECTS) $(tools_process_test_LDADD) $(LIBS) +tools/tools_reader_test-reader_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/reader_test$(EXEEXT): $(tools_reader_test_OBJECTS) $(tools_reader_test_DEPENDENCIES) $(EXTRA_tools_reader_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/reader_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_reader_test_OBJECTS) $(tools_reader_test_LDADD) $(LIBS) +tools/tools_requirements_test-requirements_test.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + +tools/requirements_test$(EXEEXT): $(tools_requirements_test_OBJECTS) $(tools_requirements_test_DEPENDENCIES) $(EXTRA_tools_requirements_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/requirements_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_requirements_test_OBJECTS) $(tools_requirements_test_LDADD) $(LIBS) +tools/several_tcs_helper.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/several_tcs_helper$(EXEEXT): $(tools_several_tcs_helper_OBJECTS) $(tools_several_tcs_helper_DEPENDENCIES) $(EXTRA_tools_several_tcs_helper_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/several_tcs_helper$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(tools_several_tcs_helper_OBJECTS) $(tools_several_tcs_helper_LDADD) $(LIBS) +tools/tools_signals_test-signals_test.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_signals_test-signals.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/signals_test$(EXEEXT): $(tools_signals_test_OBJECTS) $(tools_signals_test_DEPENDENCIES) $(EXTRA_tools_signals_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/signals_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_signals_test_OBJECTS) $(tools_signals_test_LDADD) $(LIBS) +tools/tools_test_program_test-test_program_test.$(OBJEXT): \ + tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + +tools/test_program_test$(EXEEXT): $(tools_test_program_test_OBJECTS) $(tools_test_program_test_DEPENDENCIES) $(EXTRA_tools_test_program_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/test_program_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_test_program_test_OBJECTS) $(tools_test_program_test_LDADD) $(LIBS) +tools/tools_text_test-text_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_text_test-text.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/text_test$(EXEEXT): $(tools_text_test_OBJECTS) $(tools_text_test_DEPENDENCIES) $(EXTRA_tools_text_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/text_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_text_test_OBJECTS) $(tools_text_test_LDADD) $(LIBS) +tools/tools_ui_test-ui_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_ui_test-ui.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/ui_test$(EXEEXT): $(tools_ui_test_OBJECTS) $(tools_ui_test_DEPENDENCIES) $(EXTRA_tools_ui_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/ui_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_ui_test_OBJECTS) $(tools_ui_test_LDADD) $(LIBS) +tools/tools_user_test-user_test.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) +tools/tools_user_test-user.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/user_test$(EXEEXT): $(tools_user_test_OBJECTS) $(tools_user_test_DEPENDENCIES) $(EXTRA_tools_user_test_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/user_test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(tools_user_test_OBJECTS) $(tools_user_test_LDADD) $(LIBS) +tools/zero_tcs_helper.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +tools/zero_tcs_helper$(EXEEXT): $(tools_zero_tcs_helper_OBJECTS) $(tools_zero_tcs_helper_DEPENDENCIES) $(EXTRA_tools_zero_tcs_helper_DEPENDENCIES) tools/$(am__dirstamp) + @rm -f tools/zero_tcs_helper$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(tools_zero_tcs_helper_OBJECTS) $(tools_zero_tcs_helper_LDADD) $(LIBS) install-tests_atf_cSCRIPTS: $(tests_atf_c_SCRIPTS) @$(NORMAL_INSTALL) @list='$(tests_atf_c_SCRIPTS)'; test -n "$(tests_atf_cdir)" || list=; \ @@ -3160,111 +3102,6 @@ uninstall-tests_atf_c__SCRIPTS: files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ dir='$(DESTDIR)$(tests_atf_c__dir)'; $(am__uninstall_files_from_dir) -install-tests_atf_configSCRIPTS: $(tests_atf_config_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(tests_atf_config_SCRIPTS)'; test -n "$(tests_atf_configdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_atf_configdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_atf_configdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_configdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_configdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-tests_atf_configSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(tests_atf_config_SCRIPTS)'; test -n "$(tests_atf_configdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(tests_atf_configdir)'; $(am__uninstall_files_from_dir) -install-tests_atf_reportSCRIPTS: $(tests_atf_report_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(tests_atf_report_SCRIPTS)'; test -n "$(tests_atf_reportdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_atf_reportdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_atf_reportdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_reportdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_reportdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-tests_atf_reportSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(tests_atf_report_SCRIPTS)'; test -n "$(tests_atf_reportdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(tests_atf_reportdir)'; $(am__uninstall_files_from_dir) -install-tests_atf_runSCRIPTS: $(tests_atf_run_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(tests_atf_run_SCRIPTS)'; test -n "$(tests_atf_rundir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_atf_rundir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_atf_rundir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_rundir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_rundir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-tests_atf_runSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(tests_atf_run_SCRIPTS)'; test -n "$(tests_atf_rundir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(tests_atf_rundir)'; $(am__uninstall_files_from_dir) install-tests_atf_shSCRIPTS: $(tests_atf_sh_SCRIPTS) @$(NORMAL_INSTALL) @list='$(tests_atf_sh_SCRIPTS)'; test -n "$(tests_atf_shdir)" || list=; \ @@ -3335,6 +3172,41 @@ uninstall-tests_test_programsSCRIPTS: files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ dir='$(DESTDIR)$(tests_test_programsdir)'; $(am__uninstall_files_from_dir) +install-tests_toolsSCRIPTS: $(tests_tools_SCRIPTS) + @$(NORMAL_INSTALL) + @list='$(tests_tools_SCRIPTS)'; test -n "$(tests_toolsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tests_toolsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tests_toolsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_toolsdir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_toolsdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-tests_toolsSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(tests_tools_SCRIPTS)'; test -n "$(tests_toolsdir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + dir='$(DESTDIR)$(tests_toolsdir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -3346,13 +3218,10 @@ mostlyclean-compile: -rm -f atf-c/*.lo -rm -f atf-c/detail/*.$(OBJEXT) -rm -f atf-c/detail/*.lo - -rm -f atf-config/*.$(OBJEXT) - -rm -f atf-report/*.$(OBJEXT) - -rm -f atf-run/*.$(OBJEXT) -rm -f atf-sh/*.$(OBJEXT) - -rm -f atf-version/*.$(OBJEXT) -rm -f bootstrap/*.$(OBJEXT) -rm -f test-programs/*.$(OBJEXT) + -rm -f tools/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -3376,20 +3245,15 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/env_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/exceptions.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/exceptions_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/expand.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/expand_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/fs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/fs_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/parser_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/process.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/process_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/sanity_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/test_helpers.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/text.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/text_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/ui.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/ui_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/version_helper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/atf_c_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/build_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/check_test.Po@am__quote@ @@ -3427,61 +3291,68 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/sanity_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/text_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/user_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-config/$(DEPDIR)/atf-config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/atf-report.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/atf_report_reader_test-reader.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/fail_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/misc_helpers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/pass_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/reader.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-fs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-io.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-signals.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-timer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-user.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_config_test-config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_config_test-config_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-io.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-user.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/bad_metadata_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/expect_helpers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/fs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/fs_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/io.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/io_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/misc_helpers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/pass_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/requirements.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/requirements_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/several_tcs_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/signals.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/signals_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/user.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/user_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/zero_tcs_helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/version_helper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-sh/$(DEPDIR)/atf-check.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-sh/$(DEPDIR)/atf-sh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_app_empty.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_app_opts_args.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_tp_basic_c.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_tp_basic_cpp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test-programs/$(DEPDIR)/c_helpers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test-programs/$(DEPDIR)/cpp_helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/bad_metadata_helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/expect_helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/fail_helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/pass_helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/process_helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/several_tcs_helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_application_test-application_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atf_config-atf-config.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atf_report-atf-report.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atf_run-atf-run.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atf_version-atf-version.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atffile_test-atffile_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_config_file_test-config_file_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_config_test-config_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_env_test-env_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_expand_test-expand_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_fs_test-fs_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_io_test-io_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-application.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-atffile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-config.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-config_file.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-env.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-exceptions.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-expand.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-fs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-parser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-process.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-reader.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-requirements.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-signals.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-test-program.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-text.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-timers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-ui.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-user.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_parser_test-parser_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_process_test-process_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_reader_test-reader_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_requirements_test-requirements_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_signals_test-signals.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_signals_test-signals_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_test_program_test-test_program_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_text_test-text.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_text_test-text_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_ui_test-ui.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_ui_test-ui_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_user_test-user.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_user_test-user_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/zero_tcs_helper.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -3657,355 +3528,649 @@ atf-c/detail/libatf_c_la-user.lo: atf-c/detail/user.c @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -atf-report/atf_report_reader_test-reader_test.o: atf-report/reader_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-report/atf_report_reader_test-reader_test.o -MD -MP -MF atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Tpo -c -o atf-report/atf_report_reader_test-reader_test.o `test -f 'atf-report/reader_test.cpp' || echo '$(srcdir)/'`atf-report/reader_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Tpo atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-report/reader_test.cpp' object='atf-report/atf_report_reader_test-reader_test.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-application.o: tools/application.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-application.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-application.Tpo -c -o tools/tools_libtools_a-application.o `test -f 'tools/application.cpp' || echo '$(srcdir)/'`tools/application.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-application.Tpo tools/$(DEPDIR)/tools_libtools_a-application.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/application.cpp' object='tools/tools_libtools_a-application.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-report/atf_report_reader_test-reader_test.o `test -f 'atf-report/reader_test.cpp' || echo '$(srcdir)/'`atf-report/reader_test.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-application.o `test -f 'tools/application.cpp' || echo '$(srcdir)/'`tools/application.cpp -atf-report/atf_report_reader_test-reader_test.obj: atf-report/reader_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-report/atf_report_reader_test-reader_test.obj -MD -MP -MF atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Tpo -c -o atf-report/atf_report_reader_test-reader_test.obj `if test -f 'atf-report/reader_test.cpp'; then $(CYGPATH_W) 'atf-report/reader_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-report/reader_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Tpo atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-report/reader_test.cpp' object='atf-report/atf_report_reader_test-reader_test.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-application.obj: tools/application.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-application.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-application.Tpo -c -o tools/tools_libtools_a-application.obj `if test -f 'tools/application.cpp'; then $(CYGPATH_W) 'tools/application.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/application.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-application.Tpo tools/$(DEPDIR)/tools_libtools_a-application.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/application.cpp' object='tools/tools_libtools_a-application.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-report/atf_report_reader_test-reader_test.obj `if test -f 'atf-report/reader_test.cpp'; then $(CYGPATH_W) 'atf-report/reader_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-report/reader_test.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-application.obj `if test -f 'tools/application.cpp'; then $(CYGPATH_W) 'tools/application.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/application.cpp'; fi` -atf-report/atf_report_reader_test-reader.o: atf-report/reader.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-report/atf_report_reader_test-reader.o -MD -MP -MF atf-report/$(DEPDIR)/atf_report_reader_test-reader.Tpo -c -o atf-report/atf_report_reader_test-reader.o `test -f 'atf-report/reader.cpp' || echo '$(srcdir)/'`atf-report/reader.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-report/$(DEPDIR)/atf_report_reader_test-reader.Tpo atf-report/$(DEPDIR)/atf_report_reader_test-reader.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-report/reader.cpp' object='atf-report/atf_report_reader_test-reader.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-atffile.o: tools/atffile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-atffile.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-atffile.Tpo -c -o tools/tools_libtools_a-atffile.o `test -f 'tools/atffile.cpp' || echo '$(srcdir)/'`tools/atffile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-atffile.Tpo tools/$(DEPDIR)/tools_libtools_a-atffile.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atffile.cpp' object='tools/tools_libtools_a-atffile.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-report/atf_report_reader_test-reader.o `test -f 'atf-report/reader.cpp' || echo '$(srcdir)/'`atf-report/reader.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-atffile.o `test -f 'tools/atffile.cpp' || echo '$(srcdir)/'`tools/atffile.cpp -atf-report/atf_report_reader_test-reader.obj: atf-report/reader.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-report/atf_report_reader_test-reader.obj -MD -MP -MF atf-report/$(DEPDIR)/atf_report_reader_test-reader.Tpo -c -o atf-report/atf_report_reader_test-reader.obj `if test -f 'atf-report/reader.cpp'; then $(CYGPATH_W) 'atf-report/reader.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-report/reader.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-report/$(DEPDIR)/atf_report_reader_test-reader.Tpo atf-report/$(DEPDIR)/atf_report_reader_test-reader.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-report/reader.cpp' object='atf-report/atf_report_reader_test-reader.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-atffile.obj: tools/atffile.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-atffile.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-atffile.Tpo -c -o tools/tools_libtools_a-atffile.obj `if test -f 'tools/atffile.cpp'; then $(CYGPATH_W) 'tools/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atffile.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-atffile.Tpo tools/$(DEPDIR)/tools_libtools_a-atffile.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atffile.cpp' object='tools/tools_libtools_a-atffile.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-report/atf_report_reader_test-reader.obj `if test -f 'atf-report/reader.cpp'; then $(CYGPATH_W) 'atf-report/reader.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-report/reader.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-atffile.obj `if test -f 'tools/atffile.cpp'; then $(CYGPATH_W) 'tools/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atffile.cpp'; fi` -atf-run/atf_run_atf_run-atf-run.o: atf-run/atf-run.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-atf-run.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Tpo -c -o atf-run/atf_run_atf_run-atf-run.o `test -f 'atf-run/atf-run.cpp' || echo '$(srcdir)/'`atf-run/atf-run.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/atf-run.cpp' object='atf-run/atf_run_atf_run-atf-run.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-config.o: tools/config.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-config.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-config.Tpo -c -o tools/tools_libtools_a-config.o `test -f 'tools/config.cpp' || echo '$(srcdir)/'`tools/config.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-config.Tpo tools/$(DEPDIR)/tools_libtools_a-config.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config.cpp' object='tools/tools_libtools_a-config.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-atf-run.o `test -f 'atf-run/atf-run.cpp' || echo '$(srcdir)/'`atf-run/atf-run.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-config.o `test -f 'tools/config.cpp' || echo '$(srcdir)/'`tools/config.cpp -atf-run/atf_run_atf_run-atf-run.obj: atf-run/atf-run.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-atf-run.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Tpo -c -o atf-run/atf_run_atf_run-atf-run.obj `if test -f 'atf-run/atf-run.cpp'; then $(CYGPATH_W) 'atf-run/atf-run.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atf-run.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/atf-run.cpp' object='atf-run/atf_run_atf_run-atf-run.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-config.obj: tools/config.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-config.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-config.Tpo -c -o tools/tools_libtools_a-config.obj `if test -f 'tools/config.cpp'; then $(CYGPATH_W) 'tools/config.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-config.Tpo tools/$(DEPDIR)/tools_libtools_a-config.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config.cpp' object='tools/tools_libtools_a-config.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-atf-run.obj `if test -f 'atf-run/atf-run.cpp'; then $(CYGPATH_W) 'atf-run/atf-run.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atf-run.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-config.obj `if test -f 'tools/config.cpp'; then $(CYGPATH_W) 'tools/config.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config.cpp'; fi` -atf-run/atf_run_atf_run-atffile.o: atf-run/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-atffile.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Tpo -c -o atf-run/atf_run_atf_run-atffile.o `test -f 'atf-run/atffile.cpp' || echo '$(srcdir)/'`atf-run/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/atffile.cpp' object='atf-run/atf_run_atf_run-atffile.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-config_file.o: tools/config_file.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-config_file.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-config_file.Tpo -c -o tools/tools_libtools_a-config_file.o `test -f 'tools/config_file.cpp' || echo '$(srcdir)/'`tools/config_file.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-config_file.Tpo tools/$(DEPDIR)/tools_libtools_a-config_file.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_file.cpp' object='tools/tools_libtools_a-config_file.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-atffile.o `test -f 'atf-run/atffile.cpp' || echo '$(srcdir)/'`atf-run/atffile.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-config_file.o `test -f 'tools/config_file.cpp' || echo '$(srcdir)/'`tools/config_file.cpp -atf-run/atf_run_atf_run-atffile.obj: atf-run/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-atffile.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Tpo -c -o atf-run/atf_run_atf_run-atffile.obj `if test -f 'atf-run/atffile.cpp'; then $(CYGPATH_W) 'atf-run/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/atffile.cpp' object='atf-run/atf_run_atf_run-atffile.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-config_file.obj: tools/config_file.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-config_file.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-config_file.Tpo -c -o tools/tools_libtools_a-config_file.obj `if test -f 'tools/config_file.cpp'; then $(CYGPATH_W) 'tools/config_file.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_file.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-config_file.Tpo tools/$(DEPDIR)/tools_libtools_a-config_file.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_file.cpp' object='tools/tools_libtools_a-config_file.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-atffile.obj `if test -f 'atf-run/atffile.cpp'; then $(CYGPATH_W) 'atf-run/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-config_file.obj `if test -f 'tools/config_file.cpp'; then $(CYGPATH_W) 'tools/config_file.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_file.cpp'; fi` -atf-run/atf_run_atf_run-config.o: atf-run/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-config.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-config.Tpo -c -o atf-run/atf_run_atf_run-config.o `test -f 'atf-run/config.cpp' || echo '$(srcdir)/'`atf-run/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-config.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-config.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/config.cpp' object='atf-run/atf_run_atf_run-config.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-env.o: tools/env.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-env.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-env.Tpo -c -o tools/tools_libtools_a-env.o `test -f 'tools/env.cpp' || echo '$(srcdir)/'`tools/env.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-env.Tpo tools/$(DEPDIR)/tools_libtools_a-env.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/env.cpp' object='tools/tools_libtools_a-env.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-config.o `test -f 'atf-run/config.cpp' || echo '$(srcdir)/'`atf-run/config.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-env.o `test -f 'tools/env.cpp' || echo '$(srcdir)/'`tools/env.cpp -atf-run/atf_run_atf_run-config.obj: atf-run/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-config.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-config.Tpo -c -o atf-run/atf_run_atf_run-config.obj `if test -f 'atf-run/config.cpp'; then $(CYGPATH_W) 'atf-run/config.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-config.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-config.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/config.cpp' object='atf-run/atf_run_atf_run-config.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-env.obj: tools/env.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-env.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-env.Tpo -c -o tools/tools_libtools_a-env.obj `if test -f 'tools/env.cpp'; then $(CYGPATH_W) 'tools/env.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/env.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-env.Tpo tools/$(DEPDIR)/tools_libtools_a-env.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/env.cpp' object='tools/tools_libtools_a-env.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-config.obj `if test -f 'atf-run/config.cpp'; then $(CYGPATH_W) 'atf-run/config.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-env.obj `if test -f 'tools/env.cpp'; then $(CYGPATH_W) 'tools/env.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/env.cpp'; fi` -atf-run/atf_run_atf_run-fs.o: atf-run/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-fs.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-fs.Tpo -c -o atf-run/atf_run_atf_run-fs.o `test -f 'atf-run/fs.cpp' || echo '$(srcdir)/'`atf-run/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-fs.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-fs.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/fs.cpp' object='atf-run/atf_run_atf_run-fs.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-exceptions.o: tools/exceptions.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-exceptions.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-exceptions.Tpo -c -o tools/tools_libtools_a-exceptions.o `test -f 'tools/exceptions.cpp' || echo '$(srcdir)/'`tools/exceptions.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-exceptions.Tpo tools/$(DEPDIR)/tools_libtools_a-exceptions.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/exceptions.cpp' object='tools/tools_libtools_a-exceptions.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-fs.o `test -f 'atf-run/fs.cpp' || echo '$(srcdir)/'`atf-run/fs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-exceptions.o `test -f 'tools/exceptions.cpp' || echo '$(srcdir)/'`tools/exceptions.cpp -atf-run/atf_run_atf_run-fs.obj: atf-run/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-fs.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-fs.Tpo -c -o atf-run/atf_run_atf_run-fs.obj `if test -f 'atf-run/fs.cpp'; then $(CYGPATH_W) 'atf-run/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/fs.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-fs.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-fs.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/fs.cpp' object='atf-run/atf_run_atf_run-fs.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-exceptions.obj: tools/exceptions.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-exceptions.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-exceptions.Tpo -c -o tools/tools_libtools_a-exceptions.obj `if test -f 'tools/exceptions.cpp'; then $(CYGPATH_W) 'tools/exceptions.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/exceptions.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-exceptions.Tpo tools/$(DEPDIR)/tools_libtools_a-exceptions.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/exceptions.cpp' object='tools/tools_libtools_a-exceptions.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-fs.obj `if test -f 'atf-run/fs.cpp'; then $(CYGPATH_W) 'atf-run/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/fs.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-exceptions.obj `if test -f 'tools/exceptions.cpp'; then $(CYGPATH_W) 'tools/exceptions.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/exceptions.cpp'; fi` -atf-run/atf_run_atf_run-io.o: atf-run/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-io.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-io.Tpo -c -o atf-run/atf_run_atf_run-io.o `test -f 'atf-run/io.cpp' || echo '$(srcdir)/'`atf-run/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-io.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-io.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/io.cpp' object='atf-run/atf_run_atf_run-io.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-expand.o: tools/expand.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-expand.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-expand.Tpo -c -o tools/tools_libtools_a-expand.o `test -f 'tools/expand.cpp' || echo '$(srcdir)/'`tools/expand.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-expand.Tpo tools/$(DEPDIR)/tools_libtools_a-expand.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/expand.cpp' object='tools/tools_libtools_a-expand.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-io.o `test -f 'atf-run/io.cpp' || echo '$(srcdir)/'`atf-run/io.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-expand.o `test -f 'tools/expand.cpp' || echo '$(srcdir)/'`tools/expand.cpp -atf-run/atf_run_atf_run-io.obj: atf-run/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-io.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-io.Tpo -c -o atf-run/atf_run_atf_run-io.obj `if test -f 'atf-run/io.cpp'; then $(CYGPATH_W) 'atf-run/io.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/io.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-io.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-io.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/io.cpp' object='atf-run/atf_run_atf_run-io.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-expand.obj: tools/expand.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-expand.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-expand.Tpo -c -o tools/tools_libtools_a-expand.obj `if test -f 'tools/expand.cpp'; then $(CYGPATH_W) 'tools/expand.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/expand.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-expand.Tpo tools/$(DEPDIR)/tools_libtools_a-expand.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/expand.cpp' object='tools/tools_libtools_a-expand.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-io.obj `if test -f 'atf-run/io.cpp'; then $(CYGPATH_W) 'atf-run/io.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/io.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-expand.obj `if test -f 'tools/expand.cpp'; then $(CYGPATH_W) 'tools/expand.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/expand.cpp'; fi` -atf-run/atf_run_atf_run-requirements.o: atf-run/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-requirements.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Tpo -c -o atf-run/atf_run_atf_run-requirements.o `test -f 'atf-run/requirements.cpp' || echo '$(srcdir)/'`atf-run/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/requirements.cpp' object='atf-run/atf_run_atf_run-requirements.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-fs.o: tools/fs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-fs.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-fs.Tpo -c -o tools/tools_libtools_a-fs.o `test -f 'tools/fs.cpp' || echo '$(srcdir)/'`tools/fs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-fs.Tpo tools/$(DEPDIR)/tools_libtools_a-fs.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/fs.cpp' object='tools/tools_libtools_a-fs.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-requirements.o `test -f 'atf-run/requirements.cpp' || echo '$(srcdir)/'`atf-run/requirements.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-fs.o `test -f 'tools/fs.cpp' || echo '$(srcdir)/'`tools/fs.cpp -atf-run/atf_run_atf_run-requirements.obj: atf-run/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-requirements.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Tpo -c -o atf-run/atf_run_atf_run-requirements.obj `if test -f 'atf-run/requirements.cpp'; then $(CYGPATH_W) 'atf-run/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/requirements.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/requirements.cpp' object='atf-run/atf_run_atf_run-requirements.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-fs.obj: tools/fs.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-fs.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-fs.Tpo -c -o tools/tools_libtools_a-fs.obj `if test -f 'tools/fs.cpp'; then $(CYGPATH_W) 'tools/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/fs.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-fs.Tpo tools/$(DEPDIR)/tools_libtools_a-fs.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/fs.cpp' object='tools/tools_libtools_a-fs.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-requirements.obj `if test -f 'atf-run/requirements.cpp'; then $(CYGPATH_W) 'atf-run/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/requirements.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-fs.obj `if test -f 'tools/fs.cpp'; then $(CYGPATH_W) 'tools/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/fs.cpp'; fi` -atf-run/atf_run_atf_run-signals.o: atf-run/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-signals.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-signals.Tpo -c -o atf-run/atf_run_atf_run-signals.o `test -f 'atf-run/signals.cpp' || echo '$(srcdir)/'`atf-run/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-signals.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-signals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/signals.cpp' object='atf-run/atf_run_atf_run-signals.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-io.o: tools/io.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-io.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-io.Tpo -c -o tools/tools_libtools_a-io.o `test -f 'tools/io.cpp' || echo '$(srcdir)/'`tools/io.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-io.Tpo tools/$(DEPDIR)/tools_libtools_a-io.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/io.cpp' object='tools/tools_libtools_a-io.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-signals.o `test -f 'atf-run/signals.cpp' || echo '$(srcdir)/'`atf-run/signals.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-io.o `test -f 'tools/io.cpp' || echo '$(srcdir)/'`tools/io.cpp -atf-run/atf_run_atf_run-signals.obj: atf-run/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-signals.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-signals.Tpo -c -o atf-run/atf_run_atf_run-signals.obj `if test -f 'atf-run/signals.cpp'; then $(CYGPATH_W) 'atf-run/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/signals.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-signals.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-signals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/signals.cpp' object='atf-run/atf_run_atf_run-signals.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-io.obj: tools/io.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-io.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-io.Tpo -c -o tools/tools_libtools_a-io.obj `if test -f 'tools/io.cpp'; then $(CYGPATH_W) 'tools/io.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/io.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-io.Tpo tools/$(DEPDIR)/tools_libtools_a-io.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/io.cpp' object='tools/tools_libtools_a-io.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-signals.obj `if test -f 'atf-run/signals.cpp'; then $(CYGPATH_W) 'atf-run/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/signals.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-io.obj `if test -f 'tools/io.cpp'; then $(CYGPATH_W) 'tools/io.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/io.cpp'; fi` -atf-run/atf_run_atf_run-test-program.o: atf-run/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-test-program.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Tpo -c -o atf-run/atf_run_atf_run-test-program.o `test -f 'atf-run/test-program.cpp' || echo '$(srcdir)/'`atf-run/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/test-program.cpp' object='atf-run/atf_run_atf_run-test-program.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-parser.o: tools/parser.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-parser.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-parser.Tpo -c -o tools/tools_libtools_a-parser.o `test -f 'tools/parser.cpp' || echo '$(srcdir)/'`tools/parser.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-parser.Tpo tools/$(DEPDIR)/tools_libtools_a-parser.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/parser.cpp' object='tools/tools_libtools_a-parser.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-test-program.o `test -f 'atf-run/test-program.cpp' || echo '$(srcdir)/'`atf-run/test-program.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-parser.o `test -f 'tools/parser.cpp' || echo '$(srcdir)/'`tools/parser.cpp -atf-run/atf_run_atf_run-test-program.obj: atf-run/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-test-program.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Tpo -c -o atf-run/atf_run_atf_run-test-program.obj `if test -f 'atf-run/test-program.cpp'; then $(CYGPATH_W) 'atf-run/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test-program.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/test-program.cpp' object='atf-run/atf_run_atf_run-test-program.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-parser.obj: tools/parser.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-parser.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-parser.Tpo -c -o tools/tools_libtools_a-parser.obj `if test -f 'tools/parser.cpp'; then $(CYGPATH_W) 'tools/parser.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/parser.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-parser.Tpo tools/$(DEPDIR)/tools_libtools_a-parser.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/parser.cpp' object='tools/tools_libtools_a-parser.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-test-program.obj `if test -f 'atf-run/test-program.cpp'; then $(CYGPATH_W) 'atf-run/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test-program.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-parser.obj `if test -f 'tools/parser.cpp'; then $(CYGPATH_W) 'tools/parser.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/parser.cpp'; fi` -atf-run/atf_run_atf_run-timer.o: atf-run/timer.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-timer.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-timer.Tpo -c -o atf-run/atf_run_atf_run-timer.o `test -f 'atf-run/timer.cpp' || echo '$(srcdir)/'`atf-run/timer.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-timer.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-timer.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/timer.cpp' object='atf-run/atf_run_atf_run-timer.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-process.o: tools/process.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-process.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-process.Tpo -c -o tools/tools_libtools_a-process.o `test -f 'tools/process.cpp' || echo '$(srcdir)/'`tools/process.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-process.Tpo tools/$(DEPDIR)/tools_libtools_a-process.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/process.cpp' object='tools/tools_libtools_a-process.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-timer.o `test -f 'atf-run/timer.cpp' || echo '$(srcdir)/'`atf-run/timer.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-process.o `test -f 'tools/process.cpp' || echo '$(srcdir)/'`tools/process.cpp -atf-run/atf_run_atf_run-timer.obj: atf-run/timer.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-timer.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-timer.Tpo -c -o atf-run/atf_run_atf_run-timer.obj `if test -f 'atf-run/timer.cpp'; then $(CYGPATH_W) 'atf-run/timer.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/timer.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-timer.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-timer.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/timer.cpp' object='atf-run/atf_run_atf_run-timer.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-process.obj: tools/process.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-process.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-process.Tpo -c -o tools/tools_libtools_a-process.obj `if test -f 'tools/process.cpp'; then $(CYGPATH_W) 'tools/process.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/process.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-process.Tpo tools/$(DEPDIR)/tools_libtools_a-process.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/process.cpp' object='tools/tools_libtools_a-process.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-timer.obj `if test -f 'atf-run/timer.cpp'; then $(CYGPATH_W) 'atf-run/timer.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/timer.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-process.obj `if test -f 'tools/process.cpp'; then $(CYGPATH_W) 'tools/process.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/process.cpp'; fi` -atf-run/atf_run_atf_run-user.o: atf-run/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-user.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-user.Tpo -c -o atf-run/atf_run_atf_run-user.o `test -f 'atf-run/user.cpp' || echo '$(srcdir)/'`atf-run/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-user.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-user.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/user.cpp' object='atf-run/atf_run_atf_run-user.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-reader.o: tools/reader.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-reader.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-reader.Tpo -c -o tools/tools_libtools_a-reader.o `test -f 'tools/reader.cpp' || echo '$(srcdir)/'`tools/reader.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-reader.Tpo tools/$(DEPDIR)/tools_libtools_a-reader.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/reader.cpp' object='tools/tools_libtools_a-reader.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-user.o `test -f 'atf-run/user.cpp' || echo '$(srcdir)/'`atf-run/user.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-reader.o `test -f 'tools/reader.cpp' || echo '$(srcdir)/'`tools/reader.cpp -atf-run/atf_run_atf_run-user.obj: atf-run/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-user.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-user.Tpo -c -o atf-run/atf_run_atf_run-user.obj `if test -f 'atf-run/user.cpp'; then $(CYGPATH_W) 'atf-run/user.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/user.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-user.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-user.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/user.cpp' object='atf-run/atf_run_atf_run-user.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-reader.obj: tools/reader.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-reader.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-reader.Tpo -c -o tools/tools_libtools_a-reader.obj `if test -f 'tools/reader.cpp'; then $(CYGPATH_W) 'tools/reader.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/reader.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-reader.Tpo tools/$(DEPDIR)/tools_libtools_a-reader.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/reader.cpp' object='tools/tools_libtools_a-reader.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-user.obj `if test -f 'atf-run/user.cpp'; then $(CYGPATH_W) 'atf-run/user.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/user.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-reader.obj `if test -f 'tools/reader.cpp'; then $(CYGPATH_W) 'tools/reader.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/reader.cpp'; fi` -atf-run/atf_run_atffile_test-atffile_test.o: atf-run/atffile_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atffile_test-atffile_test.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Tpo -c -o atf-run/atf_run_atffile_test-atffile_test.o `test -f 'atf-run/atffile_test.cpp' || echo '$(srcdir)/'`atf-run/atffile_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Tpo atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/atffile_test.cpp' object='atf-run/atf_run_atffile_test-atffile_test.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-requirements.o: tools/requirements.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-requirements.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-requirements.Tpo -c -o tools/tools_libtools_a-requirements.o `test -f 'tools/requirements.cpp' || echo '$(srcdir)/'`tools/requirements.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-requirements.Tpo tools/$(DEPDIR)/tools_libtools_a-requirements.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/requirements.cpp' object='tools/tools_libtools_a-requirements.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atffile_test-atffile_test.o `test -f 'atf-run/atffile_test.cpp' || echo '$(srcdir)/'`atf-run/atffile_test.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-requirements.o `test -f 'tools/requirements.cpp' || echo '$(srcdir)/'`tools/requirements.cpp -atf-run/atf_run_atffile_test-atffile_test.obj: atf-run/atffile_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atffile_test-atffile_test.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Tpo -c -o atf-run/atf_run_atffile_test-atffile_test.obj `if test -f 'atf-run/atffile_test.cpp'; then $(CYGPATH_W) 'atf-run/atffile_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Tpo atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/atffile_test.cpp' object='atf-run/atf_run_atffile_test-atffile_test.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-requirements.obj: tools/requirements.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-requirements.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-requirements.Tpo -c -o tools/tools_libtools_a-requirements.obj `if test -f 'tools/requirements.cpp'; then $(CYGPATH_W) 'tools/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/requirements.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-requirements.Tpo tools/$(DEPDIR)/tools_libtools_a-requirements.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/requirements.cpp' object='tools/tools_libtools_a-requirements.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atffile_test-atffile_test.obj `if test -f 'atf-run/atffile_test.cpp'; then $(CYGPATH_W) 'atf-run/atffile_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile_test.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-requirements.obj `if test -f 'tools/requirements.cpp'; then $(CYGPATH_W) 'tools/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/requirements.cpp'; fi` -atf-run/atf_run_atffile_test-atffile.o: atf-run/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atffile_test-atffile.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Tpo -c -o atf-run/atf_run_atffile_test-atffile.o `test -f 'atf-run/atffile.cpp' || echo '$(srcdir)/'`atf-run/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Tpo atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/atffile.cpp' object='atf-run/atf_run_atffile_test-atffile.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-signals.o: tools/signals.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-signals.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-signals.Tpo -c -o tools/tools_libtools_a-signals.o `test -f 'tools/signals.cpp' || echo '$(srcdir)/'`tools/signals.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-signals.Tpo tools/$(DEPDIR)/tools_libtools_a-signals.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals.cpp' object='tools/tools_libtools_a-signals.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atffile_test-atffile.o `test -f 'atf-run/atffile.cpp' || echo '$(srcdir)/'`atf-run/atffile.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-signals.o `test -f 'tools/signals.cpp' || echo '$(srcdir)/'`tools/signals.cpp -atf-run/atf_run_atffile_test-atffile.obj: atf-run/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atffile_test-atffile.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Tpo -c -o atf-run/atf_run_atffile_test-atffile.obj `if test -f 'atf-run/atffile.cpp'; then $(CYGPATH_W) 'atf-run/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Tpo atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/atffile.cpp' object='atf-run/atf_run_atffile_test-atffile.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-signals.obj: tools/signals.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-signals.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-signals.Tpo -c -o tools/tools_libtools_a-signals.obj `if test -f 'tools/signals.cpp'; then $(CYGPATH_W) 'tools/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-signals.Tpo tools/$(DEPDIR)/tools_libtools_a-signals.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals.cpp' object='tools/tools_libtools_a-signals.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atffile_test-atffile.obj `if test -f 'atf-run/atffile.cpp'; then $(CYGPATH_W) 'atf-run/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-signals.obj `if test -f 'tools/signals.cpp'; then $(CYGPATH_W) 'tools/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals.cpp'; fi` -atf-run/atf_run_config_test-config_test.o: atf-run/config_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_config_test-config_test.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_config_test-config_test.Tpo -c -o atf-run/atf_run_config_test-config_test.o `test -f 'atf-run/config_test.cpp' || echo '$(srcdir)/'`atf-run/config_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_config_test-config_test.Tpo atf-run/$(DEPDIR)/atf_run_config_test-config_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/config_test.cpp' object='atf-run/atf_run_config_test-config_test.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-test-program.o: tools/test-program.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-test-program.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-test-program.Tpo -c -o tools/tools_libtools_a-test-program.o `test -f 'tools/test-program.cpp' || echo '$(srcdir)/'`tools/test-program.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-test-program.Tpo tools/$(DEPDIR)/tools_libtools_a-test-program.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/test-program.cpp' object='tools/tools_libtools_a-test-program.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_config_test-config_test.o `test -f 'atf-run/config_test.cpp' || echo '$(srcdir)/'`atf-run/config_test.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-test-program.o `test -f 'tools/test-program.cpp' || echo '$(srcdir)/'`tools/test-program.cpp -atf-run/atf_run_config_test-config_test.obj: atf-run/config_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_config_test-config_test.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_config_test-config_test.Tpo -c -o atf-run/atf_run_config_test-config_test.obj `if test -f 'atf-run/config_test.cpp'; then $(CYGPATH_W) 'atf-run/config_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_config_test-config_test.Tpo atf-run/$(DEPDIR)/atf_run_config_test-config_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/config_test.cpp' object='atf-run/atf_run_config_test-config_test.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-test-program.obj: tools/test-program.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-test-program.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-test-program.Tpo -c -o tools/tools_libtools_a-test-program.obj `if test -f 'tools/test-program.cpp'; then $(CYGPATH_W) 'tools/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/test-program.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-test-program.Tpo tools/$(DEPDIR)/tools_libtools_a-test-program.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/test-program.cpp' object='tools/tools_libtools_a-test-program.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_config_test-config_test.obj `if test -f 'atf-run/config_test.cpp'; then $(CYGPATH_W) 'atf-run/config_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config_test.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-test-program.obj `if test -f 'tools/test-program.cpp'; then $(CYGPATH_W) 'tools/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/test-program.cpp'; fi` -atf-run/atf_run_config_test-config.o: atf-run/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_config_test-config.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_config_test-config.Tpo -c -o atf-run/atf_run_config_test-config.o `test -f 'atf-run/config.cpp' || echo '$(srcdir)/'`atf-run/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_config_test-config.Tpo atf-run/$(DEPDIR)/atf_run_config_test-config.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/config.cpp' object='atf-run/atf_run_config_test-config.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-text.o: tools/text.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-text.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-text.Tpo -c -o tools/tools_libtools_a-text.o `test -f 'tools/text.cpp' || echo '$(srcdir)/'`tools/text.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-text.Tpo tools/$(DEPDIR)/tools_libtools_a-text.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text.cpp' object='tools/tools_libtools_a-text.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_config_test-config.o `test -f 'atf-run/config.cpp' || echo '$(srcdir)/'`atf-run/config.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-text.o `test -f 'tools/text.cpp' || echo '$(srcdir)/'`tools/text.cpp -atf-run/atf_run_config_test-config.obj: atf-run/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_config_test-config.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_config_test-config.Tpo -c -o atf-run/atf_run_config_test-config.obj `if test -f 'atf-run/config.cpp'; then $(CYGPATH_W) 'atf-run/config.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_config_test-config.Tpo atf-run/$(DEPDIR)/atf_run_config_test-config.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/config.cpp' object='atf-run/atf_run_config_test-config.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-text.obj: tools/text.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-text.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-text.Tpo -c -o tools/tools_libtools_a-text.obj `if test -f 'tools/text.cpp'; then $(CYGPATH_W) 'tools/text.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-text.Tpo tools/$(DEPDIR)/tools_libtools_a-text.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text.cpp' object='tools/tools_libtools_a-text.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_config_test-config.obj `if test -f 'atf-run/config.cpp'; then $(CYGPATH_W) 'atf-run/config.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-text.obj `if test -f 'tools/text.cpp'; then $(CYGPATH_W) 'tools/text.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text.cpp'; fi` -atf-run/atf_run_test_program_test-test_program_test.o: atf-run/test_program_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-test_program_test.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Tpo -c -o atf-run/atf_run_test_program_test-test_program_test.o `test -f 'atf-run/test_program_test.cpp' || echo '$(srcdir)/'`atf-run/test_program_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/test_program_test.cpp' object='atf-run/atf_run_test_program_test-test_program_test.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-timers.o: tools/timers.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-timers.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-timers.Tpo -c -o tools/tools_libtools_a-timers.o `test -f 'tools/timers.cpp' || echo '$(srcdir)/'`tools/timers.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-timers.Tpo tools/$(DEPDIR)/tools_libtools_a-timers.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/timers.cpp' object='tools/tools_libtools_a-timers.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-test_program_test.o `test -f 'atf-run/test_program_test.cpp' || echo '$(srcdir)/'`atf-run/test_program_test.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-timers.o `test -f 'tools/timers.cpp' || echo '$(srcdir)/'`tools/timers.cpp -atf-run/atf_run_test_program_test-test_program_test.obj: atf-run/test_program_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-test_program_test.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Tpo -c -o atf-run/atf_run_test_program_test-test_program_test.obj `if test -f 'atf-run/test_program_test.cpp'; then $(CYGPATH_W) 'atf-run/test_program_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test_program_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/test_program_test.cpp' object='atf-run/atf_run_test_program_test-test_program_test.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-timers.obj: tools/timers.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-timers.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-timers.Tpo -c -o tools/tools_libtools_a-timers.obj `if test -f 'tools/timers.cpp'; then $(CYGPATH_W) 'tools/timers.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/timers.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-timers.Tpo tools/$(DEPDIR)/tools_libtools_a-timers.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/timers.cpp' object='tools/tools_libtools_a-timers.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-test_program_test.obj `if test -f 'atf-run/test_program_test.cpp'; then $(CYGPATH_W) 'atf-run/test_program_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test_program_test.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-timers.obj `if test -f 'tools/timers.cpp'; then $(CYGPATH_W) 'tools/timers.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/timers.cpp'; fi` -atf-run/atf_run_test_program_test-fs.o: atf-run/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-fs.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Tpo -c -o atf-run/atf_run_test_program_test-fs.o `test -f 'atf-run/fs.cpp' || echo '$(srcdir)/'`atf-run/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/fs.cpp' object='atf-run/atf_run_test_program_test-fs.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-ui.o: tools/ui.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-ui.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-ui.Tpo -c -o tools/tools_libtools_a-ui.o `test -f 'tools/ui.cpp' || echo '$(srcdir)/'`tools/ui.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-ui.Tpo tools/$(DEPDIR)/tools_libtools_a-ui.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui.cpp' object='tools/tools_libtools_a-ui.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-fs.o `test -f 'atf-run/fs.cpp' || echo '$(srcdir)/'`atf-run/fs.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-ui.o `test -f 'tools/ui.cpp' || echo '$(srcdir)/'`tools/ui.cpp -atf-run/atf_run_test_program_test-fs.obj: atf-run/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-fs.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Tpo -c -o atf-run/atf_run_test_program_test-fs.obj `if test -f 'atf-run/fs.cpp'; then $(CYGPATH_W) 'atf-run/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/fs.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/fs.cpp' object='atf-run/atf_run_test_program_test-fs.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-ui.obj: tools/ui.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-ui.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-ui.Tpo -c -o tools/tools_libtools_a-ui.obj `if test -f 'tools/ui.cpp'; then $(CYGPATH_W) 'tools/ui.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-ui.Tpo tools/$(DEPDIR)/tools_libtools_a-ui.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui.cpp' object='tools/tools_libtools_a-ui.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-fs.obj `if test -f 'atf-run/fs.cpp'; then $(CYGPATH_W) 'atf-run/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/fs.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-ui.obj `if test -f 'tools/ui.cpp'; then $(CYGPATH_W) 'tools/ui.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui.cpp'; fi` -atf-run/atf_run_test_program_test-io.o: atf-run/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-io.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-io.Tpo -c -o atf-run/atf_run_test_program_test-io.o `test -f 'atf-run/io.cpp' || echo '$(srcdir)/'`atf-run/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-io.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-io.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/io.cpp' object='atf-run/atf_run_test_program_test-io.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-user.o: tools/user.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-user.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-user.Tpo -c -o tools/tools_libtools_a-user.o `test -f 'tools/user.cpp' || echo '$(srcdir)/'`tools/user.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-user.Tpo tools/$(DEPDIR)/tools_libtools_a-user.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user.cpp' object='tools/tools_libtools_a-user.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-io.o `test -f 'atf-run/io.cpp' || echo '$(srcdir)/'`atf-run/io.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-user.o `test -f 'tools/user.cpp' || echo '$(srcdir)/'`tools/user.cpp -atf-run/atf_run_test_program_test-io.obj: atf-run/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-io.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-io.Tpo -c -o atf-run/atf_run_test_program_test-io.obj `if test -f 'atf-run/io.cpp'; then $(CYGPATH_W) 'atf-run/io.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/io.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-io.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-io.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/io.cpp' object='atf-run/atf_run_test_program_test-io.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_libtools_a-user.obj: tools/user.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-user.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-user.Tpo -c -o tools/tools_libtools_a-user.obj `if test -f 'tools/user.cpp'; then $(CYGPATH_W) 'tools/user.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-user.Tpo tools/$(DEPDIR)/tools_libtools_a-user.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user.cpp' object='tools/tools_libtools_a-user.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-io.obj `if test -f 'atf-run/io.cpp'; then $(CYGPATH_W) 'atf-run/io.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/io.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-user.obj `if test -f 'tools/user.cpp'; then $(CYGPATH_W) 'tools/user.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user.cpp'; fi` -atf-run/atf_run_test_program_test-requirements.o: atf-run/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-requirements.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Tpo -c -o atf-run/atf_run_test_program_test-requirements.o `test -f 'atf-run/requirements.cpp' || echo '$(srcdir)/'`atf-run/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/requirements.cpp' object='atf-run/atf_run_test_program_test-requirements.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_application_test-application_test.o: tools/application_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_application_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_application_test-application_test.o -MD -MP -MF tools/$(DEPDIR)/tools_application_test-application_test.Tpo -c -o tools/tools_application_test-application_test.o `test -f 'tools/application_test.cpp' || echo '$(srcdir)/'`tools/application_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_application_test-application_test.Tpo tools/$(DEPDIR)/tools_application_test-application_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/application_test.cpp' object='tools/tools_application_test-application_test.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-requirements.o `test -f 'atf-run/requirements.cpp' || echo '$(srcdir)/'`atf-run/requirements.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_application_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_application_test-application_test.o `test -f 'tools/application_test.cpp' || echo '$(srcdir)/'`tools/application_test.cpp -atf-run/atf_run_test_program_test-requirements.obj: atf-run/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-requirements.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Tpo -c -o atf-run/atf_run_test_program_test-requirements.obj `if test -f 'atf-run/requirements.cpp'; then $(CYGPATH_W) 'atf-run/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/requirements.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/requirements.cpp' object='atf-run/atf_run_test_program_test-requirements.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_application_test-application_test.obj: tools/application_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_application_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_application_test-application_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_application_test-application_test.Tpo -c -o tools/tools_application_test-application_test.obj `if test -f 'tools/application_test.cpp'; then $(CYGPATH_W) 'tools/application_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/application_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_application_test-application_test.Tpo tools/$(DEPDIR)/tools_application_test-application_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/application_test.cpp' object='tools/tools_application_test-application_test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-requirements.obj `if test -f 'atf-run/requirements.cpp'; then $(CYGPATH_W) 'atf-run/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/requirements.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_application_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_application_test-application_test.obj `if test -f 'tools/application_test.cpp'; then $(CYGPATH_W) 'tools/application_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/application_test.cpp'; fi` -atf-run/atf_run_test_program_test-signals.o: atf-run/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-signals.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Tpo -c -o atf-run/atf_run_test_program_test-signals.o `test -f 'atf-run/signals.cpp' || echo '$(srcdir)/'`atf-run/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/signals.cpp' object='atf-run/atf_run_test_program_test-signals.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_atf_config-atf-config.o: tools/atf-config.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_config_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_config-atf-config.o -MD -MP -MF tools/$(DEPDIR)/tools_atf_config-atf-config.Tpo -c -o tools/tools_atf_config-atf-config.o `test -f 'tools/atf-config.cpp' || echo '$(srcdir)/'`tools/atf-config.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_config-atf-config.Tpo tools/$(DEPDIR)/tools_atf_config-atf-config.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-config.cpp' object='tools/tools_atf_config-atf-config.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-signals.o `test -f 'atf-run/signals.cpp' || echo '$(srcdir)/'`atf-run/signals.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_config_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_config-atf-config.o `test -f 'tools/atf-config.cpp' || echo '$(srcdir)/'`tools/atf-config.cpp -atf-run/atf_run_test_program_test-signals.obj: atf-run/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-signals.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Tpo -c -o atf-run/atf_run_test_program_test-signals.obj `if test -f 'atf-run/signals.cpp'; then $(CYGPATH_W) 'atf-run/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/signals.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/signals.cpp' object='atf-run/atf_run_test_program_test-signals.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_atf_config-atf-config.obj: tools/atf-config.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_config_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_config-atf-config.obj -MD -MP -MF tools/$(DEPDIR)/tools_atf_config-atf-config.Tpo -c -o tools/tools_atf_config-atf-config.obj `if test -f 'tools/atf-config.cpp'; then $(CYGPATH_W) 'tools/atf-config.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-config.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_config-atf-config.Tpo tools/$(DEPDIR)/tools_atf_config-atf-config.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-config.cpp' object='tools/tools_atf_config-atf-config.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-signals.obj `if test -f 'atf-run/signals.cpp'; then $(CYGPATH_W) 'atf-run/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/signals.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_config_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_config-atf-config.obj `if test -f 'tools/atf-config.cpp'; then $(CYGPATH_W) 'tools/atf-config.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-config.cpp'; fi` -atf-run/atf_run_test_program_test-test-program.o: atf-run/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-test-program.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Tpo -c -o atf-run/atf_run_test_program_test-test-program.o `test -f 'atf-run/test-program.cpp' || echo '$(srcdir)/'`atf-run/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/test-program.cpp' object='atf-run/atf_run_test_program_test-test-program.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_atf_report-atf-report.o: tools/atf-report.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_report_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_report-atf-report.o -MD -MP -MF tools/$(DEPDIR)/tools_atf_report-atf-report.Tpo -c -o tools/tools_atf_report-atf-report.o `test -f 'tools/atf-report.cpp' || echo '$(srcdir)/'`tools/atf-report.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_report-atf-report.Tpo tools/$(DEPDIR)/tools_atf_report-atf-report.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-report.cpp' object='tools/tools_atf_report-atf-report.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-test-program.o `test -f 'atf-run/test-program.cpp' || echo '$(srcdir)/'`atf-run/test-program.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_report_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_report-atf-report.o `test -f 'tools/atf-report.cpp' || echo '$(srcdir)/'`tools/atf-report.cpp -atf-run/atf_run_test_program_test-test-program.obj: atf-run/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-test-program.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Tpo -c -o atf-run/atf_run_test_program_test-test-program.obj `if test -f 'atf-run/test-program.cpp'; then $(CYGPATH_W) 'atf-run/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test-program.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/test-program.cpp' object='atf-run/atf_run_test_program_test-test-program.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_atf_report-atf-report.obj: tools/atf-report.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_report_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_report-atf-report.obj -MD -MP -MF tools/$(DEPDIR)/tools_atf_report-atf-report.Tpo -c -o tools/tools_atf_report-atf-report.obj `if test -f 'tools/atf-report.cpp'; then $(CYGPATH_W) 'tools/atf-report.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-report.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_report-atf-report.Tpo tools/$(DEPDIR)/tools_atf_report-atf-report.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-report.cpp' object='tools/tools_atf_report-atf-report.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-test-program.obj `if test -f 'atf-run/test-program.cpp'; then $(CYGPATH_W) 'atf-run/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test-program.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_report_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_report-atf-report.obj `if test -f 'tools/atf-report.cpp'; then $(CYGPATH_W) 'tools/atf-report.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-report.cpp'; fi` -atf-run/atf_run_test_program_test-timer.o: atf-run/timer.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-timer.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Tpo -c -o atf-run/atf_run_test_program_test-timer.o `test -f 'atf-run/timer.cpp' || echo '$(srcdir)/'`atf-run/timer.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/timer.cpp' object='atf-run/atf_run_test_program_test-timer.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_atf_run-atf-run.o: tools/atf-run.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_run-atf-run.o -MD -MP -MF tools/$(DEPDIR)/tools_atf_run-atf-run.Tpo -c -o tools/tools_atf_run-atf-run.o `test -f 'tools/atf-run.cpp' || echo '$(srcdir)/'`tools/atf-run.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_run-atf-run.Tpo tools/$(DEPDIR)/tools_atf_run-atf-run.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-run.cpp' object='tools/tools_atf_run-atf-run.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-timer.o `test -f 'atf-run/timer.cpp' || echo '$(srcdir)/'`atf-run/timer.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_run-atf-run.o `test -f 'tools/atf-run.cpp' || echo '$(srcdir)/'`tools/atf-run.cpp -atf-run/atf_run_test_program_test-timer.obj: atf-run/timer.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-timer.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Tpo -c -o atf-run/atf_run_test_program_test-timer.obj `if test -f 'atf-run/timer.cpp'; then $(CYGPATH_W) 'atf-run/timer.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/timer.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/timer.cpp' object='atf-run/atf_run_test_program_test-timer.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_atf_run-atf-run.obj: tools/atf-run.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_run-atf-run.obj -MD -MP -MF tools/$(DEPDIR)/tools_atf_run-atf-run.Tpo -c -o tools/tools_atf_run-atf-run.obj `if test -f 'tools/atf-run.cpp'; then $(CYGPATH_W) 'tools/atf-run.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-run.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_run-atf-run.Tpo tools/$(DEPDIR)/tools_atf_run-atf-run.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-run.cpp' object='tools/tools_atf_run-atf-run.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-timer.obj `if test -f 'atf-run/timer.cpp'; then $(CYGPATH_W) 'atf-run/timer.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/timer.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_run-atf-run.obj `if test -f 'tools/atf-run.cpp'; then $(CYGPATH_W) 'tools/atf-run.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-run.cpp'; fi` -atf-run/atf_run_test_program_test-user.o: atf-run/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-user.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-user.Tpo -c -o atf-run/atf_run_test_program_test-user.o `test -f 'atf-run/user.cpp' || echo '$(srcdir)/'`atf-run/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-user.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-user.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/user.cpp' object='atf-run/atf_run_test_program_test-user.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_atf_version-atf-version.o: tools/atf-version.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_version-atf-version.o -MD -MP -MF tools/$(DEPDIR)/tools_atf_version-atf-version.Tpo -c -o tools/tools_atf_version-atf-version.o `test -f 'tools/atf-version.cpp' || echo '$(srcdir)/'`tools/atf-version.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_version-atf-version.Tpo tools/$(DEPDIR)/tools_atf_version-atf-version.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-version.cpp' object='tools/tools_atf_version-atf-version.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-user.o `test -f 'atf-run/user.cpp' || echo '$(srcdir)/'`atf-run/user.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_version-atf-version.o `test -f 'tools/atf-version.cpp' || echo '$(srcdir)/'`tools/atf-version.cpp -atf-run/atf_run_test_program_test-user.obj: atf-run/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-user.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-user.Tpo -c -o atf-run/atf_run_test_program_test-user.obj `if test -f 'atf-run/user.cpp'; then $(CYGPATH_W) 'atf-run/user.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/user.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-user.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-user.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-run/user.cpp' object='atf-run/atf_run_test_program_test-user.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_atf_version-atf-version.obj: tools/atf-version.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_version-atf-version.obj -MD -MP -MF tools/$(DEPDIR)/tools_atf_version-atf-version.Tpo -c -o tools/tools_atf_version-atf-version.obj `if test -f 'tools/atf-version.cpp'; then $(CYGPATH_W) 'tools/atf-version.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-version.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_version-atf-version.Tpo tools/$(DEPDIR)/tools_atf_version-atf-version.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-version.cpp' object='tools/tools_atf_version-atf-version.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-user.obj `if test -f 'atf-run/user.cpp'; then $(CYGPATH_W) 'atf-run/user.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/user.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_version-atf-version.obj `if test -f 'tools/atf-version.cpp'; then $(CYGPATH_W) 'tools/atf-version.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-version.cpp'; fi` -atf-version/atf_version_atf_version-atf-version.o: atf-version/atf-version.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_version_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-version/atf_version_atf_version-atf-version.o -MD -MP -MF atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Tpo -c -o atf-version/atf_version_atf_version-atf-version.o `test -f 'atf-version/atf-version.cpp' || echo '$(srcdir)/'`atf-version/atf-version.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Tpo atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-version/atf-version.cpp' object='atf-version/atf_version_atf_version-atf-version.o' libtool=no @AMDEPBACKSLASH@ +tools/tools_atffile_test-atffile_test.o: tools/atffile_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atffile_test-atffile_test.o -MD -MP -MF tools/$(DEPDIR)/tools_atffile_test-atffile_test.Tpo -c -o tools/tools_atffile_test-atffile_test.o `test -f 'tools/atffile_test.cpp' || echo '$(srcdir)/'`tools/atffile_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atffile_test-atffile_test.Tpo tools/$(DEPDIR)/tools_atffile_test-atffile_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atffile_test.cpp' object='tools/tools_atffile_test-atffile_test.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_version_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-version/atf_version_atf_version-atf-version.o `test -f 'atf-version/atf-version.cpp' || echo '$(srcdir)/'`atf-version/atf-version.cpp +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atffile_test-atffile_test.o `test -f 'tools/atffile_test.cpp' || echo '$(srcdir)/'`tools/atffile_test.cpp -atf-version/atf_version_atf_version-atf-version.obj: atf-version/atf-version.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_version_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-version/atf_version_atf_version-atf-version.obj -MD -MP -MF atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Tpo -c -o atf-version/atf_version_atf_version-atf-version.obj `if test -f 'atf-version/atf-version.cpp'; then $(CYGPATH_W) 'atf-version/atf-version.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-version/atf-version.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Tpo atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='atf-version/atf-version.cpp' object='atf-version/atf_version_atf_version-atf-version.obj' libtool=no @AMDEPBACKSLASH@ +tools/tools_atffile_test-atffile_test.obj: tools/atffile_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atffile_test-atffile_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_atffile_test-atffile_test.Tpo -c -o tools/tools_atffile_test-atffile_test.obj `if test -f 'tools/atffile_test.cpp'; then $(CYGPATH_W) 'tools/atffile_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atffile_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atffile_test-atffile_test.Tpo tools/$(DEPDIR)/tools_atffile_test-atffile_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atffile_test.cpp' object='tools/tools_atffile_test-atffile_test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_version_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-version/atf_version_atf_version-atf-version.obj `if test -f 'atf-version/atf-version.cpp'; then $(CYGPATH_W) 'atf-version/atf-version.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-version/atf-version.cpp'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atffile_test-atffile_test.obj `if test -f 'tools/atffile_test.cpp'; then $(CYGPATH_W) 'tools/atffile_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atffile_test.cpp'; fi` + +tools/tools_auto_array_test-auto_array_test.o: tools/auto_array_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_auto_array_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_auto_array_test-auto_array_test.o -MD -MP -MF tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Tpo -c -o tools/tools_auto_array_test-auto_array_test.o `test -f 'tools/auto_array_test.cpp' || echo '$(srcdir)/'`tools/auto_array_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Tpo tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/auto_array_test.cpp' object='tools/tools_auto_array_test-auto_array_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_auto_array_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_auto_array_test-auto_array_test.o `test -f 'tools/auto_array_test.cpp' || echo '$(srcdir)/'`tools/auto_array_test.cpp + +tools/tools_auto_array_test-auto_array_test.obj: tools/auto_array_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_auto_array_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_auto_array_test-auto_array_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Tpo -c -o tools/tools_auto_array_test-auto_array_test.obj `if test -f 'tools/auto_array_test.cpp'; then $(CYGPATH_W) 'tools/auto_array_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/auto_array_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Tpo tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/auto_array_test.cpp' object='tools/tools_auto_array_test-auto_array_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_auto_array_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_auto_array_test-auto_array_test.obj `if test -f 'tools/auto_array_test.cpp'; then $(CYGPATH_W) 'tools/auto_array_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/auto_array_test.cpp'; fi` + +tools/tools_config_file_test-config_file_test.o: tools/config_file_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_file_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_config_file_test-config_file_test.o -MD -MP -MF tools/$(DEPDIR)/tools_config_file_test-config_file_test.Tpo -c -o tools/tools_config_file_test-config_file_test.o `test -f 'tools/config_file_test.cpp' || echo '$(srcdir)/'`tools/config_file_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_config_file_test-config_file_test.Tpo tools/$(DEPDIR)/tools_config_file_test-config_file_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_file_test.cpp' object='tools/tools_config_file_test-config_file_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_file_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_config_file_test-config_file_test.o `test -f 'tools/config_file_test.cpp' || echo '$(srcdir)/'`tools/config_file_test.cpp + +tools/tools_config_file_test-config_file_test.obj: tools/config_file_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_file_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_config_file_test-config_file_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_config_file_test-config_file_test.Tpo -c -o tools/tools_config_file_test-config_file_test.obj `if test -f 'tools/config_file_test.cpp'; then $(CYGPATH_W) 'tools/config_file_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_file_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_config_file_test-config_file_test.Tpo tools/$(DEPDIR)/tools_config_file_test-config_file_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_file_test.cpp' object='tools/tools_config_file_test-config_file_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_file_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_config_file_test-config_file_test.obj `if test -f 'tools/config_file_test.cpp'; then $(CYGPATH_W) 'tools/config_file_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_file_test.cpp'; fi` + +tools/tools_config_test-config_test.o: tools/config_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_config_test-config_test.o -MD -MP -MF tools/$(DEPDIR)/tools_config_test-config_test.Tpo -c -o tools/tools_config_test-config_test.o `test -f 'tools/config_test.cpp' || echo '$(srcdir)/'`tools/config_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_config_test-config_test.Tpo tools/$(DEPDIR)/tools_config_test-config_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_test.cpp' object='tools/tools_config_test-config_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_config_test-config_test.o `test -f 'tools/config_test.cpp' || echo '$(srcdir)/'`tools/config_test.cpp + +tools/tools_config_test-config_test.obj: tools/config_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_config_test-config_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_config_test-config_test.Tpo -c -o tools/tools_config_test-config_test.obj `if test -f 'tools/config_test.cpp'; then $(CYGPATH_W) 'tools/config_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_config_test-config_test.Tpo tools/$(DEPDIR)/tools_config_test-config_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_test.cpp' object='tools/tools_config_test-config_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_config_test-config_test.obj `if test -f 'tools/config_test.cpp'; then $(CYGPATH_W) 'tools/config_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_test.cpp'; fi` + +tools/tools_env_test-env_test.o: tools/env_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_env_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_env_test-env_test.o -MD -MP -MF tools/$(DEPDIR)/tools_env_test-env_test.Tpo -c -o tools/tools_env_test-env_test.o `test -f 'tools/env_test.cpp' || echo '$(srcdir)/'`tools/env_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_env_test-env_test.Tpo tools/$(DEPDIR)/tools_env_test-env_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/env_test.cpp' object='tools/tools_env_test-env_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_env_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_env_test-env_test.o `test -f 'tools/env_test.cpp' || echo '$(srcdir)/'`tools/env_test.cpp + +tools/tools_env_test-env_test.obj: tools/env_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_env_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_env_test-env_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_env_test-env_test.Tpo -c -o tools/tools_env_test-env_test.obj `if test -f 'tools/env_test.cpp'; then $(CYGPATH_W) 'tools/env_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/env_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_env_test-env_test.Tpo tools/$(DEPDIR)/tools_env_test-env_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/env_test.cpp' object='tools/tools_env_test-env_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_env_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_env_test-env_test.obj `if test -f 'tools/env_test.cpp'; then $(CYGPATH_W) 'tools/env_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/env_test.cpp'; fi` + +tools/tools_expand_test-expand_test.o: tools/expand_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_expand_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_expand_test-expand_test.o -MD -MP -MF tools/$(DEPDIR)/tools_expand_test-expand_test.Tpo -c -o tools/tools_expand_test-expand_test.o `test -f 'tools/expand_test.cpp' || echo '$(srcdir)/'`tools/expand_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_expand_test-expand_test.Tpo tools/$(DEPDIR)/tools_expand_test-expand_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/expand_test.cpp' object='tools/tools_expand_test-expand_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_expand_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_expand_test-expand_test.o `test -f 'tools/expand_test.cpp' || echo '$(srcdir)/'`tools/expand_test.cpp + +tools/tools_expand_test-expand_test.obj: tools/expand_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_expand_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_expand_test-expand_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_expand_test-expand_test.Tpo -c -o tools/tools_expand_test-expand_test.obj `if test -f 'tools/expand_test.cpp'; then $(CYGPATH_W) 'tools/expand_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/expand_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_expand_test-expand_test.Tpo tools/$(DEPDIR)/tools_expand_test-expand_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/expand_test.cpp' object='tools/tools_expand_test-expand_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_expand_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_expand_test-expand_test.obj `if test -f 'tools/expand_test.cpp'; then $(CYGPATH_W) 'tools/expand_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/expand_test.cpp'; fi` + +tools/tools_fs_test-fs_test.o: tools/fs_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_fs_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_fs_test-fs_test.o -MD -MP -MF tools/$(DEPDIR)/tools_fs_test-fs_test.Tpo -c -o tools/tools_fs_test-fs_test.o `test -f 'tools/fs_test.cpp' || echo '$(srcdir)/'`tools/fs_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_fs_test-fs_test.Tpo tools/$(DEPDIR)/tools_fs_test-fs_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/fs_test.cpp' object='tools/tools_fs_test-fs_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_fs_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_fs_test-fs_test.o `test -f 'tools/fs_test.cpp' || echo '$(srcdir)/'`tools/fs_test.cpp + +tools/tools_fs_test-fs_test.obj: tools/fs_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_fs_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_fs_test-fs_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_fs_test-fs_test.Tpo -c -o tools/tools_fs_test-fs_test.obj `if test -f 'tools/fs_test.cpp'; then $(CYGPATH_W) 'tools/fs_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/fs_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_fs_test-fs_test.Tpo tools/$(DEPDIR)/tools_fs_test-fs_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/fs_test.cpp' object='tools/tools_fs_test-fs_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_fs_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_fs_test-fs_test.obj `if test -f 'tools/fs_test.cpp'; then $(CYGPATH_W) 'tools/fs_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/fs_test.cpp'; fi` + +tools/tools_io_test-io_test.o: tools/io_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_io_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_io_test-io_test.o -MD -MP -MF tools/$(DEPDIR)/tools_io_test-io_test.Tpo -c -o tools/tools_io_test-io_test.o `test -f 'tools/io_test.cpp' || echo '$(srcdir)/'`tools/io_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_io_test-io_test.Tpo tools/$(DEPDIR)/tools_io_test-io_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/io_test.cpp' object='tools/tools_io_test-io_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_io_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_io_test-io_test.o `test -f 'tools/io_test.cpp' || echo '$(srcdir)/'`tools/io_test.cpp + +tools/tools_io_test-io_test.obj: tools/io_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_io_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_io_test-io_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_io_test-io_test.Tpo -c -o tools/tools_io_test-io_test.obj `if test -f 'tools/io_test.cpp'; then $(CYGPATH_W) 'tools/io_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/io_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_io_test-io_test.Tpo tools/$(DEPDIR)/tools_io_test-io_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/io_test.cpp' object='tools/tools_io_test-io_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_io_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_io_test-io_test.obj `if test -f 'tools/io_test.cpp'; then $(CYGPATH_W) 'tools/io_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/io_test.cpp'; fi` + +tools/tools_misc_helpers-misc_helpers.o: tools/misc_helpers.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_misc_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_misc_helpers-misc_helpers.o -MD -MP -MF tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Tpo -c -o tools/tools_misc_helpers-misc_helpers.o `test -f 'tools/misc_helpers.cpp' || echo '$(srcdir)/'`tools/misc_helpers.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Tpo tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/misc_helpers.cpp' object='tools/tools_misc_helpers-misc_helpers.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_misc_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_misc_helpers-misc_helpers.o `test -f 'tools/misc_helpers.cpp' || echo '$(srcdir)/'`tools/misc_helpers.cpp + +tools/tools_misc_helpers-misc_helpers.obj: tools/misc_helpers.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_misc_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_misc_helpers-misc_helpers.obj -MD -MP -MF tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Tpo -c -o tools/tools_misc_helpers-misc_helpers.obj `if test -f 'tools/misc_helpers.cpp'; then $(CYGPATH_W) 'tools/misc_helpers.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/misc_helpers.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Tpo tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/misc_helpers.cpp' object='tools/tools_misc_helpers-misc_helpers.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_misc_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_misc_helpers-misc_helpers.obj `if test -f 'tools/misc_helpers.cpp'; then $(CYGPATH_W) 'tools/misc_helpers.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/misc_helpers.cpp'; fi` + +tools/tools_parser_test-parser_test.o: tools/parser_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_parser_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_parser_test-parser_test.o -MD -MP -MF tools/$(DEPDIR)/tools_parser_test-parser_test.Tpo -c -o tools/tools_parser_test-parser_test.o `test -f 'tools/parser_test.cpp' || echo '$(srcdir)/'`tools/parser_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_parser_test-parser_test.Tpo tools/$(DEPDIR)/tools_parser_test-parser_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/parser_test.cpp' object='tools/tools_parser_test-parser_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_parser_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_parser_test-parser_test.o `test -f 'tools/parser_test.cpp' || echo '$(srcdir)/'`tools/parser_test.cpp + +tools/tools_parser_test-parser_test.obj: tools/parser_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_parser_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_parser_test-parser_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_parser_test-parser_test.Tpo -c -o tools/tools_parser_test-parser_test.obj `if test -f 'tools/parser_test.cpp'; then $(CYGPATH_W) 'tools/parser_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/parser_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_parser_test-parser_test.Tpo tools/$(DEPDIR)/tools_parser_test-parser_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/parser_test.cpp' object='tools/tools_parser_test-parser_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_parser_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_parser_test-parser_test.obj `if test -f 'tools/parser_test.cpp'; then $(CYGPATH_W) 'tools/parser_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/parser_test.cpp'; fi` + +tools/tools_process_test-process_test.o: tools/process_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_process_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_process_test-process_test.o -MD -MP -MF tools/$(DEPDIR)/tools_process_test-process_test.Tpo -c -o tools/tools_process_test-process_test.o `test -f 'tools/process_test.cpp' || echo '$(srcdir)/'`tools/process_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_process_test-process_test.Tpo tools/$(DEPDIR)/tools_process_test-process_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/process_test.cpp' object='tools/tools_process_test-process_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_process_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_process_test-process_test.o `test -f 'tools/process_test.cpp' || echo '$(srcdir)/'`tools/process_test.cpp + +tools/tools_process_test-process_test.obj: tools/process_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_process_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_process_test-process_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_process_test-process_test.Tpo -c -o tools/tools_process_test-process_test.obj `if test -f 'tools/process_test.cpp'; then $(CYGPATH_W) 'tools/process_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/process_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_process_test-process_test.Tpo tools/$(DEPDIR)/tools_process_test-process_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/process_test.cpp' object='tools/tools_process_test-process_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_process_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_process_test-process_test.obj `if test -f 'tools/process_test.cpp'; then $(CYGPATH_W) 'tools/process_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/process_test.cpp'; fi` + +tools/tools_reader_test-reader_test.o: tools/reader_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_reader_test-reader_test.o -MD -MP -MF tools/$(DEPDIR)/tools_reader_test-reader_test.Tpo -c -o tools/tools_reader_test-reader_test.o `test -f 'tools/reader_test.cpp' || echo '$(srcdir)/'`tools/reader_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_reader_test-reader_test.Tpo tools/$(DEPDIR)/tools_reader_test-reader_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/reader_test.cpp' object='tools/tools_reader_test-reader_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_reader_test-reader_test.o `test -f 'tools/reader_test.cpp' || echo '$(srcdir)/'`tools/reader_test.cpp + +tools/tools_reader_test-reader_test.obj: tools/reader_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_reader_test-reader_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_reader_test-reader_test.Tpo -c -o tools/tools_reader_test-reader_test.obj `if test -f 'tools/reader_test.cpp'; then $(CYGPATH_W) 'tools/reader_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/reader_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_reader_test-reader_test.Tpo tools/$(DEPDIR)/tools_reader_test-reader_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/reader_test.cpp' object='tools/tools_reader_test-reader_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_reader_test-reader_test.obj `if test -f 'tools/reader_test.cpp'; then $(CYGPATH_W) 'tools/reader_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/reader_test.cpp'; fi` + +tools/tools_requirements_test-requirements_test.o: tools/requirements_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_requirements_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_requirements_test-requirements_test.o -MD -MP -MF tools/$(DEPDIR)/tools_requirements_test-requirements_test.Tpo -c -o tools/tools_requirements_test-requirements_test.o `test -f 'tools/requirements_test.cpp' || echo '$(srcdir)/'`tools/requirements_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_requirements_test-requirements_test.Tpo tools/$(DEPDIR)/tools_requirements_test-requirements_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/requirements_test.cpp' object='tools/tools_requirements_test-requirements_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_requirements_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_requirements_test-requirements_test.o `test -f 'tools/requirements_test.cpp' || echo '$(srcdir)/'`tools/requirements_test.cpp + +tools/tools_requirements_test-requirements_test.obj: tools/requirements_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_requirements_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_requirements_test-requirements_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_requirements_test-requirements_test.Tpo -c -o tools/tools_requirements_test-requirements_test.obj `if test -f 'tools/requirements_test.cpp'; then $(CYGPATH_W) 'tools/requirements_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/requirements_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_requirements_test-requirements_test.Tpo tools/$(DEPDIR)/tools_requirements_test-requirements_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/requirements_test.cpp' object='tools/tools_requirements_test-requirements_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_requirements_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_requirements_test-requirements_test.obj `if test -f 'tools/requirements_test.cpp'; then $(CYGPATH_W) 'tools/requirements_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/requirements_test.cpp'; fi` + +tools/tools_signals_test-signals_test.o: tools/signals_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_signals_test-signals_test.o -MD -MP -MF tools/$(DEPDIR)/tools_signals_test-signals_test.Tpo -c -o tools/tools_signals_test-signals_test.o `test -f 'tools/signals_test.cpp' || echo '$(srcdir)/'`tools/signals_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_signals_test-signals_test.Tpo tools/$(DEPDIR)/tools_signals_test-signals_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals_test.cpp' object='tools/tools_signals_test-signals_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_signals_test-signals_test.o `test -f 'tools/signals_test.cpp' || echo '$(srcdir)/'`tools/signals_test.cpp + +tools/tools_signals_test-signals_test.obj: tools/signals_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_signals_test-signals_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_signals_test-signals_test.Tpo -c -o tools/tools_signals_test-signals_test.obj `if test -f 'tools/signals_test.cpp'; then $(CYGPATH_W) 'tools/signals_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_signals_test-signals_test.Tpo tools/$(DEPDIR)/tools_signals_test-signals_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals_test.cpp' object='tools/tools_signals_test-signals_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_signals_test-signals_test.obj `if test -f 'tools/signals_test.cpp'; then $(CYGPATH_W) 'tools/signals_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals_test.cpp'; fi` + +tools/tools_signals_test-signals.o: tools/signals.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_signals_test-signals.o -MD -MP -MF tools/$(DEPDIR)/tools_signals_test-signals.Tpo -c -o tools/tools_signals_test-signals.o `test -f 'tools/signals.cpp' || echo '$(srcdir)/'`tools/signals.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_signals_test-signals.Tpo tools/$(DEPDIR)/tools_signals_test-signals.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals.cpp' object='tools/tools_signals_test-signals.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_signals_test-signals.o `test -f 'tools/signals.cpp' || echo '$(srcdir)/'`tools/signals.cpp + +tools/tools_signals_test-signals.obj: tools/signals.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_signals_test-signals.obj -MD -MP -MF tools/$(DEPDIR)/tools_signals_test-signals.Tpo -c -o tools/tools_signals_test-signals.obj `if test -f 'tools/signals.cpp'; then $(CYGPATH_W) 'tools/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_signals_test-signals.Tpo tools/$(DEPDIR)/tools_signals_test-signals.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals.cpp' object='tools/tools_signals_test-signals.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_signals_test-signals.obj `if test -f 'tools/signals.cpp'; then $(CYGPATH_W) 'tools/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals.cpp'; fi` + +tools/tools_test_program_test-test_program_test.o: tools/test_program_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_test_program_test-test_program_test.o -MD -MP -MF tools/$(DEPDIR)/tools_test_program_test-test_program_test.Tpo -c -o tools/tools_test_program_test-test_program_test.o `test -f 'tools/test_program_test.cpp' || echo '$(srcdir)/'`tools/test_program_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_test_program_test-test_program_test.Tpo tools/$(DEPDIR)/tools_test_program_test-test_program_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/test_program_test.cpp' object='tools/tools_test_program_test-test_program_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_test_program_test-test_program_test.o `test -f 'tools/test_program_test.cpp' || echo '$(srcdir)/'`tools/test_program_test.cpp + +tools/tools_test_program_test-test_program_test.obj: tools/test_program_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_test_program_test-test_program_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_test_program_test-test_program_test.Tpo -c -o tools/tools_test_program_test-test_program_test.obj `if test -f 'tools/test_program_test.cpp'; then $(CYGPATH_W) 'tools/test_program_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/test_program_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_test_program_test-test_program_test.Tpo tools/$(DEPDIR)/tools_test_program_test-test_program_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/test_program_test.cpp' object='tools/tools_test_program_test-test_program_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_test_program_test-test_program_test.obj `if test -f 'tools/test_program_test.cpp'; then $(CYGPATH_W) 'tools/test_program_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/test_program_test.cpp'; fi` + +tools/tools_text_test-text_test.o: tools/text_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_text_test-text_test.o -MD -MP -MF tools/$(DEPDIR)/tools_text_test-text_test.Tpo -c -o tools/tools_text_test-text_test.o `test -f 'tools/text_test.cpp' || echo '$(srcdir)/'`tools/text_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_text_test-text_test.Tpo tools/$(DEPDIR)/tools_text_test-text_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text_test.cpp' object='tools/tools_text_test-text_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_text_test-text_test.o `test -f 'tools/text_test.cpp' || echo '$(srcdir)/'`tools/text_test.cpp + +tools/tools_text_test-text_test.obj: tools/text_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_text_test-text_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_text_test-text_test.Tpo -c -o tools/tools_text_test-text_test.obj `if test -f 'tools/text_test.cpp'; then $(CYGPATH_W) 'tools/text_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_text_test-text_test.Tpo tools/$(DEPDIR)/tools_text_test-text_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text_test.cpp' object='tools/tools_text_test-text_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_text_test-text_test.obj `if test -f 'tools/text_test.cpp'; then $(CYGPATH_W) 'tools/text_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text_test.cpp'; fi` + +tools/tools_text_test-text.o: tools/text.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_text_test-text.o -MD -MP -MF tools/$(DEPDIR)/tools_text_test-text.Tpo -c -o tools/tools_text_test-text.o `test -f 'tools/text.cpp' || echo '$(srcdir)/'`tools/text.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_text_test-text.Tpo tools/$(DEPDIR)/tools_text_test-text.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text.cpp' object='tools/tools_text_test-text.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_text_test-text.o `test -f 'tools/text.cpp' || echo '$(srcdir)/'`tools/text.cpp + +tools/tools_text_test-text.obj: tools/text.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_text_test-text.obj -MD -MP -MF tools/$(DEPDIR)/tools_text_test-text.Tpo -c -o tools/tools_text_test-text.obj `if test -f 'tools/text.cpp'; then $(CYGPATH_W) 'tools/text.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_text_test-text.Tpo tools/$(DEPDIR)/tools_text_test-text.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text.cpp' object='tools/tools_text_test-text.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_text_test-text.obj `if test -f 'tools/text.cpp'; then $(CYGPATH_W) 'tools/text.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text.cpp'; fi` + +tools/tools_ui_test-ui_test.o: tools/ui_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_ui_test-ui_test.o -MD -MP -MF tools/$(DEPDIR)/tools_ui_test-ui_test.Tpo -c -o tools/tools_ui_test-ui_test.o `test -f 'tools/ui_test.cpp' || echo '$(srcdir)/'`tools/ui_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_ui_test-ui_test.Tpo tools/$(DEPDIR)/tools_ui_test-ui_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui_test.cpp' object='tools/tools_ui_test-ui_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_ui_test-ui_test.o `test -f 'tools/ui_test.cpp' || echo '$(srcdir)/'`tools/ui_test.cpp + +tools/tools_ui_test-ui_test.obj: tools/ui_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_ui_test-ui_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_ui_test-ui_test.Tpo -c -o tools/tools_ui_test-ui_test.obj `if test -f 'tools/ui_test.cpp'; then $(CYGPATH_W) 'tools/ui_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_ui_test-ui_test.Tpo tools/$(DEPDIR)/tools_ui_test-ui_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui_test.cpp' object='tools/tools_ui_test-ui_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_ui_test-ui_test.obj `if test -f 'tools/ui_test.cpp'; then $(CYGPATH_W) 'tools/ui_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui_test.cpp'; fi` + +tools/tools_ui_test-ui.o: tools/ui.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_ui_test-ui.o -MD -MP -MF tools/$(DEPDIR)/tools_ui_test-ui.Tpo -c -o tools/tools_ui_test-ui.o `test -f 'tools/ui.cpp' || echo '$(srcdir)/'`tools/ui.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_ui_test-ui.Tpo tools/$(DEPDIR)/tools_ui_test-ui.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui.cpp' object='tools/tools_ui_test-ui.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_ui_test-ui.o `test -f 'tools/ui.cpp' || echo '$(srcdir)/'`tools/ui.cpp + +tools/tools_ui_test-ui.obj: tools/ui.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_ui_test-ui.obj -MD -MP -MF tools/$(DEPDIR)/tools_ui_test-ui.Tpo -c -o tools/tools_ui_test-ui.obj `if test -f 'tools/ui.cpp'; then $(CYGPATH_W) 'tools/ui.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_ui_test-ui.Tpo tools/$(DEPDIR)/tools_ui_test-ui.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui.cpp' object='tools/tools_ui_test-ui.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_ui_test-ui.obj `if test -f 'tools/ui.cpp'; then $(CYGPATH_W) 'tools/ui.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui.cpp'; fi` + +tools/tools_user_test-user_test.o: tools/user_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_user_test-user_test.o -MD -MP -MF tools/$(DEPDIR)/tools_user_test-user_test.Tpo -c -o tools/tools_user_test-user_test.o `test -f 'tools/user_test.cpp' || echo '$(srcdir)/'`tools/user_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_user_test-user_test.Tpo tools/$(DEPDIR)/tools_user_test-user_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user_test.cpp' object='tools/tools_user_test-user_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_user_test-user_test.o `test -f 'tools/user_test.cpp' || echo '$(srcdir)/'`tools/user_test.cpp + +tools/tools_user_test-user_test.obj: tools/user_test.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_user_test-user_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_user_test-user_test.Tpo -c -o tools/tools_user_test-user_test.obj `if test -f 'tools/user_test.cpp'; then $(CYGPATH_W) 'tools/user_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user_test.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_user_test-user_test.Tpo tools/$(DEPDIR)/tools_user_test-user_test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user_test.cpp' object='tools/tools_user_test-user_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_user_test-user_test.obj `if test -f 'tools/user_test.cpp'; then $(CYGPATH_W) 'tools/user_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user_test.cpp'; fi` + +tools/tools_user_test-user.o: tools/user.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_user_test-user.o -MD -MP -MF tools/$(DEPDIR)/tools_user_test-user.Tpo -c -o tools/tools_user_test-user.o `test -f 'tools/user.cpp' || echo '$(srcdir)/'`tools/user.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_user_test-user.Tpo tools/$(DEPDIR)/tools_user_test-user.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user.cpp' object='tools/tools_user_test-user.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_user_test-user.o `test -f 'tools/user.cpp' || echo '$(srcdir)/'`tools/user.cpp + +tools/tools_user_test-user.obj: tools/user.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_user_test-user.obj -MD -MP -MF tools/$(DEPDIR)/tools_user_test-user.Tpo -c -o tools/tools_user_test-user.obj `if test -f 'tools/user.cpp'; then $(CYGPATH_W) 'tools/user.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_user_test-user.Tpo tools/$(DEPDIR)/tools_user_test-user.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user.cpp' object='tools/tools_user_test-user.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_user_test-user.obj `if test -f 'tools/user.cpp'; then $(CYGPATH_W) 'tools/user.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user.cpp'; fi` mostlyclean-libtool: -rm -f *.lo @@ -4016,13 +4181,10 @@ clean-libtool: -rm -rf atf-c++/.libs atf-c++/_libs -rm -rf atf-c++/detail/.libs atf-c++/detail/_libs -rm -rf atf-c/detail/.libs atf-c/detail/_libs - -rm -rf atf-config/.libs atf-config/_libs - -rm -rf atf-report/.libs atf-report/_libs - -rm -rf atf-run/.libs atf-run/_libs -rm -rf atf-sh/.libs atf-sh/_libs - -rm -rf atf-version/.libs atf-version/_libs -rm -rf bootstrap/.libs bootstrap/_libs -rm -rf test-programs/.libs test-programs/_libs + -rm -rf tools/.libs tools/_libs distclean-libtool: -rm -f libtool config.lt @@ -4556,69 +4718,6 @@ uninstall-tests_atf_c_detailDATA: @list='$(tests_atf_c_detail_DATA)'; test -n "$(tests_atf_c_detaildir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(tests_atf_c_detaildir)'; $(am__uninstall_files_from_dir) -install-tests_atf_configDATA: $(tests_atf_config_DATA) - @$(NORMAL_INSTALL) - @list='$(tests_atf_config_DATA)'; test -n "$(tests_atf_configdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_atf_configdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_atf_configdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_configdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_configdir)" || exit $$?; \ - done - -uninstall-tests_atf_configDATA: - @$(NORMAL_UNINSTALL) - @list='$(tests_atf_config_DATA)'; test -n "$(tests_atf_configdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(tests_atf_configdir)'; $(am__uninstall_files_from_dir) -install-tests_atf_reportDATA: $(tests_atf_report_DATA) - @$(NORMAL_INSTALL) - @list='$(tests_atf_report_DATA)'; test -n "$(tests_atf_reportdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_atf_reportdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_atf_reportdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_reportdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_reportdir)" || exit $$?; \ - done - -uninstall-tests_atf_reportDATA: - @$(NORMAL_UNINSTALL) - @list='$(tests_atf_report_DATA)'; test -n "$(tests_atf_reportdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(tests_atf_reportdir)'; $(am__uninstall_files_from_dir) -install-tests_atf_runDATA: $(tests_atf_run_DATA) - @$(NORMAL_INSTALL) - @list='$(tests_atf_run_DATA)'; test -n "$(tests_atf_rundir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_atf_rundir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_atf_rundir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_rundir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_rundir)" || exit $$?; \ - done - -uninstall-tests_atf_runDATA: - @$(NORMAL_UNINSTALL) - @list='$(tests_atf_run_DATA)'; test -n "$(tests_atf_rundir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(tests_atf_rundir)'; $(am__uninstall_files_from_dir) install-tests_atf_shDATA: $(tests_atf_sh_DATA) @$(NORMAL_INSTALL) @list='$(tests_atf_sh_DATA)'; test -n "$(tests_atf_shdir)" || list=; \ @@ -4661,6 +4760,27 @@ uninstall-tests_test_programsDATA: @list='$(tests_test_programs_DATA)'; test -n "$(tests_test_programsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(tests_test_programsdir)'; $(am__uninstall_files_from_dir) +install-tests_toolsDATA: $(tests_tools_DATA) + @$(NORMAL_INSTALL) + @list='$(tests_tools_DATA)'; test -n "$(tests_toolsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tests_toolsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tests_toolsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_toolsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_toolsdir)" || exit $$?; \ + done + +uninstall-tests_toolsDATA: + @$(NORMAL_UNINSTALL) + @list='$(tests_tools_DATA)'; test -n "$(tests_toolsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(tests_toolsdir)'; $(am__uninstall_files_from_dir) install-xslDATA: $(xsl_DATA) @$(NORMAL_INSTALL) @list='$(xsl_DATA)'; test -n "$(xsldir)" || list=; \ @@ -4980,12 +5100,12 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ - $(HEADERS) bconfig.h +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ + $(MANS) $(DATA) $(HEADERS) bconfig.h install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_reportdir)" "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_configdir)" "$(DESTDIR)$(tests_atf_reportdir)" "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(atf_aclocaldir)" "$(DESTDIR)$(atf_c__dirpkgconfigdir)" "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(egdir)" "$(DESTDIR)$(hooksdir)" "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_configdir)" "$(DESTDIR)$(tests_atf_reportdir)" "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(xsldir)" "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(atf_aclocaldir)" "$(DESTDIR)$(atf_c__dirpkgconfigdir)" "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(egdir)" "$(DESTDIR)$(hooksdir)" "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(xsldir)" "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -5024,20 +5144,14 @@ distclean-generic: -rm -f atf-c/$(am__dirstamp) -rm -f atf-c/detail/$(DEPDIR)/$(am__dirstamp) -rm -f atf-c/detail/$(am__dirstamp) - -rm -f atf-config/$(DEPDIR)/$(am__dirstamp) - -rm -f atf-config/$(am__dirstamp) - -rm -f atf-report/$(DEPDIR)/$(am__dirstamp) - -rm -f atf-report/$(am__dirstamp) - -rm -f atf-run/$(DEPDIR)/$(am__dirstamp) - -rm -f atf-run/$(am__dirstamp) -rm -f atf-sh/$(DEPDIR)/$(am__dirstamp) -rm -f atf-sh/$(am__dirstamp) - -rm -f atf-version/$(DEPDIR)/$(am__dirstamp) - -rm -f atf-version/$(am__dirstamp) -rm -f bootstrap/$(DEPDIR)/$(am__dirstamp) -rm -f bootstrap/$(am__dirstamp) -rm -f test-programs/$(DEPDIR)/$(am__dirstamp) -rm -f test-programs/$(am__dirstamp) + -rm -f tools/$(DEPDIR)/$(am__dirstamp) + -rm -f tools/$(am__dirstamp) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -5048,15 +5162,16 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \ - clean-noinstLTLIBRARIES clean-tests_atf_cPROGRAMS \ - clean-tests_atf_c__PROGRAMS clean-tests_atf_c___detailPROGRAMS \ + clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ + clean-tests_atf_cPROGRAMS clean-tests_atf_c__PROGRAMS \ + clean-tests_atf_c___detailPROGRAMS \ clean-tests_atf_c_detailPROGRAMS \ - clean-tests_atf_reportPROGRAMS clean-tests_atf_runPROGRAMS \ - clean-tests_test_programsPROGRAMS mostlyclean-am + clean-tests_test_programsPROGRAMS clean-tests_toolsPROGRAMS \ + mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-config/$(DEPDIR) atf-report/$(DEPDIR) atf-run/$(DEPDIR) atf-sh/$(DEPDIR) atf-version/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR) + -rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-sh/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR) tools/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-local distclean-tags @@ -5085,15 +5200,12 @@ install-data-am: install-atf_aclocalDATA install-atf_cHEADERS \ install-tests_atf_c___detailDATA \ install-tests_atf_c___detailPROGRAMS \ install-tests_atf_c_detailDATA \ - install-tests_atf_c_detailPROGRAMS \ - install-tests_atf_configDATA install-tests_atf_configSCRIPTS \ - install-tests_atf_reportDATA install-tests_atf_reportPROGRAMS \ - install-tests_atf_reportSCRIPTS install-tests_atf_runDATA \ - install-tests_atf_runPROGRAMS install-tests_atf_runSCRIPTS \ - install-tests_atf_shDATA install-tests_atf_shSCRIPTS \ - install-tests_test_programsDATA \ + install-tests_atf_c_detailPROGRAMS install-tests_atf_shDATA \ + install-tests_atf_shSCRIPTS install-tests_test_programsDATA \ install-tests_test_programsPROGRAMS \ - install-tests_test_programsSCRIPTS install-xslDATA + install-tests_test_programsSCRIPTS install-tests_toolsDATA \ + install-tests_toolsPROGRAMS install-tests_toolsSCRIPTS \ + install-xslDATA install-dvi: install-dvi-am @@ -5126,7 +5238,7 @@ installcheck-am: installcheck-local maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-config/$(DEPDIR) atf-report/$(DEPDIR) atf-run/$(DEPDIR) atf-sh/$(DEPDIR) atf-version/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR) + -rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-sh/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR) tools/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -5158,16 +5270,12 @@ uninstall-am: uninstall-atf_aclocalDATA uninstall-atf_cHEADERS \ uninstall-tests_atf_c___detailPROGRAMS \ uninstall-tests_atf_c_detailDATA \ uninstall-tests_atf_c_detailPROGRAMS \ - uninstall-tests_atf_configDATA \ - uninstall-tests_atf_configSCRIPTS \ - uninstall-tests_atf_reportDATA \ - uninstall-tests_atf_reportPROGRAMS \ - uninstall-tests_atf_reportSCRIPTS uninstall-tests_atf_runDATA \ - uninstall-tests_atf_runPROGRAMS uninstall-tests_atf_runSCRIPTS \ uninstall-tests_atf_shDATA uninstall-tests_atf_shSCRIPTS \ uninstall-tests_test_programsDATA \ uninstall-tests_test_programsPROGRAMS \ - uninstall-tests_test_programsSCRIPTS uninstall-xslDATA + uninstall-tests_test_programsSCRIPTS uninstall-tests_toolsDATA \ + uninstall-tests_toolsPROGRAMS uninstall-tests_toolsSCRIPTS \ + uninstall-xslDATA uninstall-man: uninstall-man1 uninstall-man3 uninstall-man4 \ uninstall-man5 uninstall-man7 @@ -5177,75 +5285,67 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-man4 \ .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-checkPROGRAMS clean-cscope \ clean-generic clean-libLTLIBRARIES clean-libexecPROGRAMS \ - clean-libtool clean-noinstLTLIBRARIES \ + clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ clean-tests_atf_cPROGRAMS clean-tests_atf_c__PROGRAMS \ clean-tests_atf_c___detailPROGRAMS \ clean-tests_atf_c_detailPROGRAMS \ - clean-tests_atf_reportPROGRAMS clean-tests_atf_runPROGRAMS \ - clean-tests_test_programsPROGRAMS cscope cscopelist-am ctags \ - ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-local distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am \ - install-atf_aclocalDATA install-atf_cHEADERS \ - install-atf_c__HEADERS install-atf_c__dirpkgconfigDATA \ - install-atf_cpkgconfigDATA install-atf_shDATA \ - install-atf_shpkgconfigDATA install-binPROGRAMS \ - install-cssDATA install-data install-data-am install-docDATA \ - install-dtdDATA install-dvi install-dvi-am install-egDATA \ - install-exec install-exec-am install-hooksDATA install-html \ - install-html-am install-includeHEADERS install-info \ - install-info-am install-libLTLIBRARIES install-libexecPROGRAMS \ - install-man install-man1 install-man3 install-man4 \ - install-man5 install-man7 install-pdf install-pdf-am \ - install-pkgtestsDATA install-ps install-ps-am install-strip \ - install-tests_atf_cDATA install-tests_atf_cPROGRAMS \ - install-tests_atf_cSCRIPTS install-tests_atf_c__DATA \ - install-tests_atf_c__PROGRAMS install-tests_atf_c__SCRIPTS \ - install-tests_atf_c___detailDATA \ + clean-tests_test_programsPROGRAMS clean-tests_toolsPROGRAMS \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-local distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-atf_aclocalDATA \ + install-atf_cHEADERS install-atf_c__HEADERS \ + install-atf_c__dirpkgconfigDATA install-atf_cpkgconfigDATA \ + install-atf_shDATA install-atf_shpkgconfigDATA \ + install-binPROGRAMS install-cssDATA install-data \ + install-data-am install-docDATA install-dtdDATA install-dvi \ + install-dvi-am install-egDATA install-exec install-exec-am \ + install-hooksDATA install-html install-html-am \ + install-includeHEADERS install-info install-info-am \ + install-libLTLIBRARIES install-libexecPROGRAMS install-man \ + install-man1 install-man3 install-man4 install-man5 \ + install-man7 install-pdf install-pdf-am install-pkgtestsDATA \ + install-ps install-ps-am install-strip install-tests_atf_cDATA \ + install-tests_atf_cPROGRAMS install-tests_atf_cSCRIPTS \ + install-tests_atf_c__DATA install-tests_atf_c__PROGRAMS \ + install-tests_atf_c__SCRIPTS install-tests_atf_c___detailDATA \ install-tests_atf_c___detailPROGRAMS \ install-tests_atf_c_detailDATA \ - install-tests_atf_c_detailPROGRAMS \ - install-tests_atf_configDATA install-tests_atf_configSCRIPTS \ - install-tests_atf_reportDATA install-tests_atf_reportPROGRAMS \ - install-tests_atf_reportSCRIPTS install-tests_atf_runDATA \ - install-tests_atf_runPROGRAMS install-tests_atf_runSCRIPTS \ - install-tests_atf_shDATA install-tests_atf_shSCRIPTS \ - install-tests_test_programsDATA \ + install-tests_atf_c_detailPROGRAMS install-tests_atf_shDATA \ + install-tests_atf_shSCRIPTS install-tests_test_programsDATA \ install-tests_test_programsPROGRAMS \ - install-tests_test_programsSCRIPTS install-xslDATA \ - installcheck installcheck-am installcheck-local installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-atf_aclocalDATA uninstall-atf_cHEADERS \ - uninstall-atf_c__HEADERS uninstall-atf_c__dirpkgconfigDATA \ - uninstall-atf_cpkgconfigDATA uninstall-atf_shDATA \ - uninstall-atf_shpkgconfigDATA uninstall-binPROGRAMS \ - uninstall-cssDATA uninstall-docDATA uninstall-dtdDATA \ - uninstall-egDATA uninstall-hooksDATA uninstall-includeHEADERS \ - uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \ - uninstall-man uninstall-man1 uninstall-man3 uninstall-man4 \ - uninstall-man5 uninstall-man7 uninstall-pkgtestsDATA \ - uninstall-tests_atf_cDATA uninstall-tests_atf_cPROGRAMS \ - uninstall-tests_atf_cSCRIPTS uninstall-tests_atf_c__DATA \ - uninstall-tests_atf_c__PROGRAMS uninstall-tests_atf_c__SCRIPTS \ + install-tests_test_programsSCRIPTS install-tests_toolsDATA \ + install-tests_toolsPROGRAMS install-tests_toolsSCRIPTS \ + install-xslDATA installcheck installcheck-am \ + installcheck-local installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-atf_aclocalDATA \ + uninstall-atf_cHEADERS uninstall-atf_c__HEADERS \ + uninstall-atf_c__dirpkgconfigDATA uninstall-atf_cpkgconfigDATA \ + uninstall-atf_shDATA uninstall-atf_shpkgconfigDATA \ + uninstall-binPROGRAMS uninstall-cssDATA uninstall-docDATA \ + uninstall-dtdDATA uninstall-egDATA uninstall-hooksDATA \ + uninstall-includeHEADERS uninstall-libLTLIBRARIES \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \ + uninstall-man3 uninstall-man4 uninstall-man5 uninstall-man7 \ + uninstall-pkgtestsDATA uninstall-tests_atf_cDATA \ + uninstall-tests_atf_cPROGRAMS uninstall-tests_atf_cSCRIPTS \ + uninstall-tests_atf_c__DATA uninstall-tests_atf_c__PROGRAMS \ + uninstall-tests_atf_c__SCRIPTS \ uninstall-tests_atf_c___detailDATA \ uninstall-tests_atf_c___detailPROGRAMS \ uninstall-tests_atf_c_detailDATA \ uninstall-tests_atf_c_detailPROGRAMS \ - uninstall-tests_atf_configDATA \ - uninstall-tests_atf_configSCRIPTS \ - uninstall-tests_atf_reportDATA \ - uninstall-tests_atf_reportPROGRAMS \ - uninstall-tests_atf_reportSCRIPTS uninstall-tests_atf_runDATA \ - uninstall-tests_atf_runPROGRAMS uninstall-tests_atf_runSCRIPTS \ uninstall-tests_atf_shDATA uninstall-tests_atf_shSCRIPTS \ uninstall-tests_test_programsDATA \ uninstall-tests_test_programsPROGRAMS \ - uninstall-tests_test_programsSCRIPTS uninstall-xslDATA + uninstall-tests_test_programsSCRIPTS uninstall-tests_toolsDATA \ + uninstall-tests_toolsPROGRAMS uninstall-tests_toolsSCRIPTS \ + uninstall-xslDATA dist-hook: check-style @@ -5253,10 +5353,6 @@ check-style: $(srcdir)/admin/check-style.sh # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 - -# XXX For some reason, the nodist line above does not work as expected. -# Work this problem around. -dist-hook: kill-defs-h kill-defs-h: rm -f $(distdir)/atf-c/defs.h atf-c/atf-c.pc: $(srcdir)/atf-c/atf-c.pc.in Makefile @@ -5371,13 +5467,6 @@ installcheck-bootstrap: @target_srcdir@bootstrap/testsuite check # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 -@ENABLE_TOOLS_TRUE@doc/atf.7: $(srcdir)/doc/atf.7.in -@ENABLE_TOOLS_TRUE@ test -d doc || mkdir -p doc -@ENABLE_TOOLS_TRUE@ sed -e 's#__DOCDIR__#$(docdir)#g' \ -@ENABLE_TOOLS_TRUE@ -e 's#__TESTSDIR__#$(testsdir)#g' \ -@ENABLE_TOOLS_TRUE@ <$(srcdir)/doc/atf.7.in >doc/atf.7.tmp -@ENABLE_TOOLS_TRUE@ mv doc/atf.7.tmp doc/atf.7 - # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 test-programs/sh_helpers: $(srcdir)/test-programs/sh_helpers.sh test -d test-programs || mkdir -p test-programs @@ -5405,34 +5494,37 @@ test-programs/srcdir_test: $(srcdir)/test-programs/srcdir_test.sh dst="test-programs/srcdir_test"; $(BUILD_SH_TP) # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 -@ENABLE_TOOLS_TRUE@atf-report/integration_test: $(srcdir)/atf-report/integration_test.sh -@ENABLE_TOOLS_TRUE@ test -d atf-report || mkdir -p atf-report -@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/atf-report/integration_test.sh"; \ -@ENABLE_TOOLS_TRUE@ dst="atf-report/integration_test"; $(BUILD_SH_TP) - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 -@ENABLE_TOOLS_TRUE@atf-config/integration_test: $(srcdir)/atf-config/integration_test.sh -@ENABLE_TOOLS_TRUE@ test -d atf-config || mkdir -p atf-config -@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/atf-config/integration_test.sh"; \ -@ENABLE_TOOLS_TRUE@ dst="atf-config/integration_test"; $(BUILD_SH_TP) - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 -@ENABLE_TOOLS_TRUE@atf-run/integration_test: $(srcdir)/atf-run/integration_test.sh -@ENABLE_TOOLS_TRUE@ test -d atf-run || mkdir -p atf-run -@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/atf-run/integration_test.sh"; \ -@ENABLE_TOOLS_TRUE@ dst="atf-run/integration_test"; $(BUILD_SH_TP) - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 -@ENABLE_TOOLS_TRUE@atf-version/revision.h: atf-version/revision.h.stamp -@ENABLE_TOOLS_TRUE@ @test -d atf-version || mkdir -p atf-version -@ENABLE_TOOLS_TRUE@ @cmp -s atf-version/revision.h atf-version/revision.h.stamp || \ -@ENABLE_TOOLS_TRUE@ cp -p atf-version/revision.h.stamp atf-version/revision.h -@ENABLE_TOOLS_TRUE@atf-version/revision.h.stamp: -@ENABLE_TOOLS_TRUE@ @test -d atf-version || mkdir -p atf-version -@ENABLE_TOOLS_TRUE@ @$(top_srcdir)/atf-version/generate-revision.sh \ -@ENABLE_TOOLS_TRUE@ -g "$(GIT)" -r $(top_srcdir) -o atf-version/revision.h.stamp \ +@ENABLE_TOOLS_TRUE@kill-defs-hpp: +@ENABLE_TOOLS_TRUE@ rm -f $(distdir)/tools/defs.hpp +@ENABLE_TOOLS_TRUE@tools/revision.h: tools/revision.h.stamp +@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools +@ENABLE_TOOLS_TRUE@ @cmp -s tools/revision.h tools/revision.h.stamp || \ +@ENABLE_TOOLS_TRUE@ cp -p tools/revision.h.stamp tools/revision.h +@ENABLE_TOOLS_TRUE@tools/revision.h.stamp: +@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools +@ENABLE_TOOLS_TRUE@ @$(top_srcdir)/tools/generate-revision.sh \ +@ENABLE_TOOLS_TRUE@ -g "$(GIT)" -r $(top_srcdir) -o tools/revision.h.stamp \ @ENABLE_TOOLS_TRUE@ -v $(PACKAGE_VERSION) +@ENABLE_TOOLS_TRUE@tools/atf.7: $(srcdir)/tools/atf.7.in +@ENABLE_TOOLS_TRUE@ test -d tools || mkdir -p tools +@ENABLE_TOOLS_TRUE@ sed -e 's#__DOCDIR__#$(docdir)#g' \ +@ENABLE_TOOLS_TRUE@ -e 's#__TESTSDIR__#$(testsdir)#g' \ +@ENABLE_TOOLS_TRUE@ <$(srcdir)/tools/atf.7.in >tools/atf.7.tmp +@ENABLE_TOOLS_TRUE@ mv tools/atf.7.tmp tools/atf.7 +@ENABLE_TOOLS_TRUE@tools/atf-config_test: $(srcdir)/tools/atf-config_test.sh +@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools +@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/tools/atf-config_test.sh"; \ +@ENABLE_TOOLS_TRUE@ dst="tools/atf-config_test"; $(BUILD_SH_TP) +@ENABLE_TOOLS_TRUE@tools/atf-report_test: $(srcdir)/tools/atf-report_test.sh +@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools +@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/tools/atf-report_test.sh"; \ +@ENABLE_TOOLS_TRUE@ dst="tools/atf-report_test"; $(BUILD_SH_TP) +@ENABLE_TOOLS_TRUE@tools/atf-run_test: $(srcdir)/tools/atf-run_test.sh +@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools +@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/tools/atf-run_test.sh"; \ +@ENABLE_TOOLS_TRUE@ dst="tools/atf-run_test"; $(BUILD_SH_TP) + # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 @ENABLE_TOOLS_TRUE@installcheck-atf: @ENABLE_TOOLS_TRUE@ logfile=$$(pwd)/installcheck.log; \ @@ -5453,12 +5545,6 @@ test-programs/srcdir_test: $(srcdir)/test-programs/srcdir_test.sh @HAVE_KYUA_TRUE@ cd $(pkgtestsdir) && $(TESTS_ENVIRONMENT) $(KYUA) test installcheck-local: $(INSTALLCHECK_TARGETS) - -# -# Custom targets. -# - -dist-hook: forbid-dist @ENABLE_TOOLS_TRUE@forbid-dist: @ENABLE_TOOLS_TRUE@ @true @ENABLE_TOOLS_FALSE@forbid-dist: @@ -5474,6 +5560,8 @@ release-test: .PHONY: $(PHONY_TARGETS) +dist-hook: $(DIST_HOOKS) + # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/NEWS b/NEWS index eca87eea7089..6b3be1758d09 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,38 @@ Major changes between releases Automated Testing Framework =========================================================================== +Changes in version 0.19 +*********************** + +Experimental version released on February 7th, 2014. + +This is the last release to bundle the code for the deprecated tools. +The next release will drop their code and will stop worrying about +backwards compatibility between the ATF libraries and what the old tools +may or may not support. + +If you still require the old tools for some reason, grab a copy of the +'tools' directory now. The code in this directory is standalone and +does not depend on any internal details of atf-c++ any longer. + +* Various fixes and improvements to support running as part of the FreeBSD + test suite. + +* Project hosting moved from Google Code (as a subproject of Kyua) to + GitHub (as a first-class project). The main reason for the change is + the suppression of binary downloads in Google Code on Jan 15th, 2014. + See https://github.com/jmmv/atf/ + +* Removed builtin help from atf-sh(1) and atf-check(1) for simplicity + reasons. In other words, their -h option is gone. + +* Moved the code of the deprecated tools into a 'tools' directory and + completely decoupled their code from the internals of atf-c++. The + reason for this is to painlessly allow a third-party to maintain a + copy of these tools after we delete them because upcoming changes to + atf-c++ would break the stale tools. + + Changes in version 0.18 *********************** diff --git a/aclocal.m4 b/aclocal.m4 index 86012f5c5218..399c24dbaf8b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -56,6 +56,66 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_AR([ACT-IF-FAIL]) +# ------------------------- +# Try to determine the archiver interface, and trigger the ar-lib wrapper +# if it is needed. If the detection of archiver interface fails, run +# ACT-IF-FAIL (default is to abort configure with a proper error message). +AC_DEFUN([AM_PROG_AR], +[AC_BEFORE([$0], [LT_INIT])dnl +AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([ar-lib])dnl +AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) +: ${AR=ar} + +AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], + [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + ]) + AC_LANG_POP([C])]) + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + m4_default([$1], + [AC_MSG_ERROR([could not determine $AR interface])]) + ;; +esac +AC_SUBST([AR])dnl +]) + # AM_AUX_DIR_EXPAND -*- Autoconf -*- # Copyright (C) 2001-2013 Free Software Foundation, Inc. @@ -1159,6 +1219,5 @@ m4_include([m4/module-application.m4]) m4_include([m4/module-defs.m4]) m4_include([m4/module-env.m4]) m4_include([m4/module-fs.m4]) -m4_include([m4/module-sanity.m4]) m4_include([m4/module-signals.m4]) m4_include([m4/runtime-tool.m4]) diff --git a/admin/ar-lib b/admin/ar-lib new file mode 100755 index 000000000000..fe2301e71a86 --- /dev/null +++ b/admin/ar-lib @@ -0,0 +1,270 @@ +#! /bin/sh +# Wrapper for Microsoft lib.exe + +me=ar-lib +scriptversion=2012-03-01.08; # UTC + +# Copyright (C) 2010-2013 Free Software Foundation, Inc. +# Written by Peter Rosin . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + + +# func_error message +func_error () +{ + echo "$me: $1" 1>&2 + exit 1 +} + +file_conv= + +# func_file_conv build_file +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv in + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_at_file at_file operation archive +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE +# for each of them. +# When interpreting the content of the @FILE, do NOT use func_file_conv, +# since the user would need to supply preconverted file names to +# binutils ar, at least for MinGW. +func_at_file () +{ + operation=$2 + archive=$3 + at_file_contents=`cat "$1"` + eval set x "$at_file_contents" + shift + + for member + do + $AR -NOLOGO $operation:"$member" "$archive" || exit $? + done +} + +case $1 in + '') + func_error "no command. Try '$0 --help' for more information." + ;; + -h | --h*) + cat < #include -#include - namespace atf { namespace process { @@ -60,7 +58,11 @@ namespace check { //! of executing arbitrary command and manages files containing //! its output. //! -class check_result : noncopyable { +class check_result { + // Non-copyable. + check_result(const check_result&); + check_result& operator=(const check_result&); + //! //! \brief Internal representation of a result. //! diff --git a/atf-c++/check_test.cpp b/atf-c++/check_test.cpp index 8e5983fdc637..a92511c2f209 100644 --- a/atf-c++/check_test.cpp +++ b/atf-c++/check_test.cpp @@ -61,7 +61,7 @@ std::auto_ptr< atf::check::check_result > do_exec(const atf::tests::tc* tc, const char* helper_name) { std::vector< std::string > argv; - argv.push_back(get_process_helpers_path(*tc).str()); + argv.push_back(get_process_helpers_path(*tc, false).str()); argv.push_back(helper_name); std::cout << "Executing " << argv[0] << " " << argv[1] << "\n"; @@ -74,7 +74,7 @@ std::auto_ptr< atf::check::check_result > do_exec(const atf::tests::tc* tc, const char* helper_name, const char *carg2) { std::vector< std::string > argv; - argv.push_back(get_process_helpers_path(*tc).str()); + argv.push_back(get_process_helpers_path(*tc, false).str()); argv.push_back(helper_name); argv.push_back(carg2); std::cout << "Executing " << argv[0] << " " << argv[1] << " " diff --git a/atf-c++/config.cpp b/atf-c++/config.cpp index 7b7d6416c34c..1890ac0e66c7 100644 --- a/atf-c++/config.cpp +++ b/atf-c++/config.cpp @@ -52,18 +52,14 @@ init_variables(void) { PRE(m_variables.empty()); - m_variables["atf_arch"] = atf_config_get("atf_arch"); m_variables["atf_build_cc"] = atf_config_get("atf_build_cc"); m_variables["atf_build_cflags"] = atf_config_get("atf_build_cflags"); m_variables["atf_build_cpp"] = atf_config_get("atf_build_cpp"); m_variables["atf_build_cppflags"] = atf_config_get("atf_build_cppflags"); m_variables["atf_build_cxx"] = atf_config_get("atf_build_cxx"); m_variables["atf_build_cxxflags"] = atf_config_get("atf_build_cxxflags"); - m_variables["atf_confdir"] = atf_config_get("atf_confdir"); m_variables["atf_includedir"] = atf_config_get("atf_includedir"); - m_variables["atf_libdir"] = atf_config_get("atf_libdir"); m_variables["atf_libexecdir"] = atf_config_get("atf_libexecdir"); - m_variables["atf_machine"] = atf_config_get("atf_machine"); m_variables["atf_pkgdatadir"] = atf_config_get("atf_pkgdatadir"); m_variables["atf_shell"] = atf_config_get("atf_shell"); m_variables["atf_workdir"] = atf_config_get("atf_workdir"); diff --git a/atf-c++/config_test.cpp b/atf-c++/config_test.cpp index a3cd2bb511d4..78e1584a5455 100644 --- a/atf-c++/config_test.cpp +++ b/atf-c++/config_test.cpp @@ -44,18 +44,14 @@ static struct varnames { const char *uc; bool can_be_empty; } all_vars[] = { - { "atf_arch", "ATF_ARCH", false }, { "atf_build_cc", "ATF_BUILD_CC", false }, { "atf_build_cflags", "ATF_BUILD_CFLAGS", true }, { "atf_build_cpp", "ATF_BUILD_CPP", false }, { "atf_build_cppflags", "ATF_BUILD_CPPFLAGS", true }, { "atf_build_cxx", "ATF_BUILD_CXX", false }, { "atf_build_cxxflags", "ATF_BUILD_CXXFLAGS", true }, - { "atf_confdir", "ATF_CONFDIR", false }, { "atf_includedir", "ATF_INCLUDEDIR", false }, - { "atf_libdir", "ATF_LIBDIR", false }, { "atf_libexecdir", "ATF_LIBEXECDIR", false }, - { "atf_machine", "ATF_MACHINE", false }, { "atf_pkgdatadir", "ATF_PKGDATADIR", false }, { "atf_shell", "ATF_SHELL", false }, { "atf_workdir", "ATF_WORKDIR", false }, diff --git a/atf-c++/detail/Atffile b/atf-c++/detail/Atffile index 2d53514bdf7e..75adc690b65b 100644 --- a/atf-c++/detail/Atffile +++ b/atf-c++/detail/Atffile @@ -6,9 +6,6 @@ tp: application_test tp: auto_array_test tp: env_test tp: exceptions_test -tp: expand_test tp: fs_test -tp: parser_test tp: sanity_test tp: text_test -tp: ui_test diff --git a/atf-c++/detail/Kyuafile b/atf-c++/detail/Kyuafile index fd0d7abe8592..03388bafc60e 100644 --- a/atf-c++/detail/Kyuafile +++ b/atf-c++/detail/Kyuafile @@ -6,9 +6,7 @@ atf_test_program{name="application_test"} atf_test_program{name="auto_array_test"} atf_test_program{name="env_test"} atf_test_program{name="exceptions_test"} -atf_test_program{name="expand_test"} atf_test_program{name="fs_test"} -atf_test_program{name="parser_test"} +atf_test_program{name="process_test"} atf_test_program{name="sanity_test"} atf_test_program{name="text_test"} -atf_test_program{name="ui_test"} diff --git a/atf-c++/detail/Makefile.am.inc b/atf-c++/detail/Makefile.am.inc index 0a7bd151e6f7..ce8701fcc221 100644 --- a/atf-c++/detail/Makefile.am.inc +++ b/atf-c++/detail/Makefile.am.inc @@ -34,19 +34,13 @@ libatf_c___la_SOURCES += atf-c++/detail/application.cpp \ atf-c++/detail/env.hpp \ atf-c++/detail/exceptions.cpp \ atf-c++/detail/exceptions.hpp \ - atf-c++/detail/expand.cpp \ - atf-c++/detail/expand.hpp \ atf-c++/detail/fs.cpp \ atf-c++/detail/fs.hpp \ - atf-c++/detail/parser.cpp \ - atf-c++/detail/parser.hpp \ atf-c++/detail/process.cpp \ atf-c++/detail/process.hpp \ atf-c++/detail/sanity.hpp \ atf-c++/detail/text.cpp \ - atf-c++/detail/text.hpp \ - atf-c++/detail/ui.cpp \ - atf-c++/detail/ui.hpp + atf-c++/detail/text.hpp tests_atf_c___detail_DATA = atf-c++/detail/Atffile \ atf-c++/detail/Kyuafile @@ -73,18 +67,10 @@ tests_atf_c___detail_PROGRAMS += atf-c++/detail/exceptions_test atf_c___detail_exceptions_test_SOURCES = atf-c++/detail/exceptions_test.cpp atf_c___detail_exceptions_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -tests_atf_c___detail_PROGRAMS += atf-c++/detail/expand_test -atf_c___detail_expand_test_SOURCES = atf-c++/detail/expand_test.cpp -atf_c___detail_expand_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) - tests_atf_c___detail_PROGRAMS += atf-c++/detail/fs_test atf_c___detail_fs_test_SOURCES = atf-c++/detail/fs_test.cpp atf_c___detail_fs_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -tests_atf_c___detail_PROGRAMS += atf-c++/detail/parser_test -atf_c___detail_parser_test_SOURCES = atf-c++/detail/parser_test.cpp -atf_c___detail_parser_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) - tests_atf_c___detail_PROGRAMS += atf-c++/detail/process_test atf_c___detail_process_test_SOURCES = atf-c++/detail/process_test.cpp atf_c___detail_process_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) @@ -97,8 +83,7 @@ tests_atf_c___detail_PROGRAMS += atf-c++/detail/text_test atf_c___detail_text_test_SOURCES = atf-c++/detail/text_test.cpp atf_c___detail_text_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -tests_atf_c___detail_PROGRAMS += atf-c++/detail/ui_test -atf_c___detail_ui_test_SOURCES = atf-c++/detail/ui_test.cpp -atf_c___detail_ui_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) +tests_atf_c___detail_PROGRAMS += atf-c++/detail/version_helper +atf_c___detail_version_helper_SOURCES = atf-c++/detail/version_helper.cpp # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/atf-c++/detail/application.cpp b/atf-c++/detail/application.cpp index 878b010bcde8..454bc64daf43 100644 --- a/atf-c++/detail/application.cpp +++ b/atf-c++/detail/application.cpp @@ -47,7 +47,6 @@ extern "C" { #include "application.hpp" #include "sanity.hpp" -#include "ui.hpp" #if !defined(HAVE_VSNPRINTF_IN_STD) namespace std { @@ -106,17 +105,12 @@ impl::option::operator<(const impl::option& o) } impl::app::app(const std::string& description, - const std::string& manpage, - const std::string& global_manpage, - const bool use_ui) : - m_hflag(false), + const std::string& manpage) : m_argc(-1), m_argv(NULL), m_prog_name(NULL), m_description(description), - m_manpage(manpage), - m_global_manpage(global_manpage), - m_use_ui(use_ui) + m_manpage(manpage) { } @@ -133,11 +127,7 @@ impl::app::inited(void) impl::app::options_set impl::app::options(void) { - options_set opts = specific_options(); - if (m_use_ui) { - opts.insert(option('h', "", "Shows this help message")); - } - return opts; + return specific_options(); } std::string @@ -187,11 +177,6 @@ impl::app::process_options(void) ::opterr = 0; while ((ch = ::getopt(m_argc, m_argv, optstr.c_str())) != -1) { switch (ch) { - case 'h': - INV(m_use_ui); - m_hflag = true; - break; - case ':': throw usage_error("Option -%c requires an argument.", ::optopt); @@ -214,51 +199,6 @@ impl::app::process_options(void) #endif } -void -impl::app::usage(std::ostream& os) -{ - PRE(inited()); - - std::string args = specific_args(); - if (!args.empty()) - args = " " + args; - os << ui::format_text_with_tag(std::string(m_prog_name) + " [options]" + - args, "Usage: ", false) << "\n\n" - << ui::format_text(m_description) << "\n\n"; - - options_set opts = options(); - INV(!opts.empty()); - os << "Available options:\n"; - size_t coldesc = 0; - for (options_set::const_iterator iter = opts.begin(); - iter != opts.end(); iter++) { - const option& opt = (*iter); - - if (opt.m_argument.length() + 1 > coldesc) - coldesc = opt.m_argument.length() + 1; - } - for (options_set::const_iterator iter = opts.begin(); - iter != opts.end(); iter++) { - const option& opt = (*iter); - - std::string tag = std::string(" -") + opt.m_character; - if (opt.m_argument.empty()) - tag += " "; - else - tag += " " + opt.m_argument + " "; - os << ui::format_text_with_tag(opt.m_description, tag, false, - coldesc + 10) << "\n"; - } - os << "\n"; - - std::string gmp; - if (!m_global_manpage.empty()) - gmp = " and " + m_global_manpage; - os << ui::format_text("For more details please see " + m_manpage + - gmp + ".") - << "\n"; -} - int impl::app::run(int argc, char* const* argv) { @@ -290,55 +230,22 @@ impl::app::run(int argc, char* const* argv) int errcode; try { - int oldargc = m_argc; - process_options(); - - if (m_hflag) { - INV(m_use_ui); - if (oldargc != 2) - throw usage_error("-h must be given alone."); - - usage(std::cout); - errcode = EXIT_SUCCESS; - } else - errcode = main(); + errcode = main(); } catch (const usage_error& e) { - if (m_use_ui) { - std::cerr << ui::format_error(m_prog_name, e.what()) << "\n" - << ui::format_info(m_prog_name, std::string("Type `") + - m_prog_name + " -h' for more details.") - << "\n"; - } else { - std::cerr << m_prog_name << ": ERROR: " << e.what() << "\n"; - std::cerr << m_prog_name << ": See " << m_manpage << " for usage " - "details.\n"; - } + std::cerr << m_prog_name << ": ERROR: " << e.what() << "\n"; + std::cerr << m_prog_name << ": See " << m_manpage << " for usage " + "details.\n"; errcode = EXIT_FAILURE; } catch (const std::runtime_error& e) { - if (m_use_ui) { - std::cerr << ui::format_error(m_prog_name, std::string(e.what())) - << "\n"; - } else { - std::cerr << m_prog_name << ": ERROR: " << e.what() << "\n"; - } + std::cerr << m_prog_name << ": ERROR: " << e.what() << "\n"; errcode = EXIT_FAILURE; } catch (const std::exception& e) { - if (m_use_ui) { - std::cerr << ui::format_error(m_prog_name, std::string("Caught " - "unexpected error: ") + e.what() + "\n" + bug) << "\n"; - } else { - std::cerr << m_prog_name << ": ERROR: Caught unexpected error: " - << e.what() << "\n"; - } + std::cerr << m_prog_name << ": ERROR: Caught unexpected error: " + << e.what() << "\n"; errcode = EXIT_FAILURE; } catch (...) { - if (m_use_ui) { - std::cerr << ui::format_error(m_prog_name, std::string("Caught " - "unknown error\n") + bug) << "\n"; - } else { - std::cerr << m_prog_name << ": ERROR: Caught unknown error\n"; - } + std::cerr << m_prog_name << ": ERROR: Caught unknown error\n"; errcode = EXIT_FAILURE; } return errcode; diff --git a/atf-c++/detail/application.hpp b/atf-c++/detail/application.hpp index 9d1f242004a3..d12b267d57b8 100644 --- a/atf-c++/detail/application.hpp +++ b/atf-c++/detail/application.hpp @@ -74,8 +74,6 @@ class option { // ------------------------------------------------------------------------ class app { - bool m_hflag; - void process_options(void); void usage(std::ostream&); @@ -90,8 +88,7 @@ class app { const char* m_argv0; const char* m_prog_name; std::string m_description; - std::string m_manpage, m_global_manpage; - const bool m_use_ui; + std::string m_manpage; options_set options(void); @@ -102,8 +99,7 @@ class app { virtual int main(void) = 0; public: - app(const std::string&, const std::string&, const std::string&, - bool = true); + app(const std::string&, const std::string&); virtual ~app(void); int run(int, char* const*); diff --git a/atf-c++/detail/application_test.cpp b/atf-c++/detail/application_test.cpp index 2a788bfb2880..4664a3aa4bf8 100644 --- a/atf-c++/detail/application_test.cpp +++ b/atf-c++/detail/application_test.cpp @@ -37,7 +37,7 @@ extern "C" { class getopt_app : public atf::application::app { public: - getopt_app(void) : app("description", "manpage", "other") {} + getopt_app(void) : app("description", "manpage") {} int main(void) { diff --git a/atf-c++/detail/exceptions.hpp b/atf-c++/detail/exceptions.hpp index f655a84d8263..9bda62b163da 100644 --- a/atf-c++/detail/exceptions.hpp +++ b/atf-c++/detail/exceptions.hpp @@ -39,47 +39,6 @@ struct atf_error; namespace atf { -template< class T > -class not_found_error : - public std::runtime_error -{ - T m_value; - -public: - not_found_error(const std::string& message, const T& value) throw(); - - virtual ~not_found_error(void) throw(); - - const T& get_value(void) const throw(); -}; - -template< class T > -inline -not_found_error< T >::not_found_error(const std::string& message, - const T& value) - throw() : - std::runtime_error(message), - m_value(value) -{ -} - -template< class T > -inline -not_found_error< T >::~not_found_error(void) - throw() -{ -} - -template< class T > -inline -const T& -not_found_error< T >::get_value(void) - const - throw() -{ - return m_value; -} - class system_error : public std::runtime_error { int m_sys_err; mutable std::string m_message; diff --git a/atf-c++/detail/process_test.cpp b/atf-c++/detail/process_test.cpp index d13ab9453a8c..a40f663108f3 100644 --- a/atf-c++/detail/process_test.cpp +++ b/atf-c++/detail/process_test.cpp @@ -64,10 +64,10 @@ exec_process_helpers(const atf::tests::tc& tc, const char* helper_name) using atf::process::exec; std::vector< std::string > argv; - argv.push_back(get_process_helpers_path(tc).leaf_name()); + argv.push_back(get_process_helpers_path(tc, true).leaf_name()); argv.push_back(helper_name); - return exec(get_process_helpers_path(tc), + return exec(get_process_helpers_path(tc, true), atf::process::argv_array(argv), atf::process::stream_inherit(), atf::process::stream_inherit()); diff --git a/atf-c++/detail/test_helpers.cpp b/atf-c++/detail/test_helpers.cpp index 191649d03d59..38e651634dde 100644 --- a/atf-c++/detail/test_helpers.cpp +++ b/atf-c++/detail/test_helpers.cpp @@ -40,80 +40,64 @@ #include "process.hpp" #include "test_helpers.hpp" -void -build_check_cxx_o_aux(const atf::fs::path& sfile, const char* failmsg, - const bool expect_pass) +// Path to the directory containing the libatf-c tests, used to locate the +// process_helpers program. If NULL (the default), the code will use a +// relative path. Otherwise, the provided path will be used; this is so +// that we can locate the helpers binary if the installation uses a +// different layout than the one we provide (as is the case in FreeBSD). +#if defined(ATF_C_TESTS_BASE) +static const char* atf_c_tests_base = ATF_C_TESTS_BASE; +#else +static const char* atf_c_tests_base = NULL; +#endif +#undef ATF_C_TESTS_BASE + +bool +build_check_cxx_o(const char* sfile) { std::vector< std::string > optargs; optargs.push_back("-I" + atf::config::get("atf_includedir")); optargs.push_back("-Wall"); optargs.push_back("-Werror"); - const bool result = atf::check::build_cxx_o( - sfile.str(), "test.o", atf::process::argv_array(optargs)); - if ((expect_pass && !result) || (!expect_pass && result)) - ATF_FAIL(failmsg); + return atf::check::build_cxx_o(sfile, "test.o", + atf::process::argv_array(optargs)); } -void -build_check_cxx_o(const atf::tests::tc& tc, const char* sfile, - const char* failmsg, const bool expect_pass) +bool +build_check_cxx_o_srcdir(const atf::tests::tc& tc, const char* sfile) { const atf::fs::path sfilepath = atf::fs::path(tc.get_config_var("srcdir")) / sfile; - build_check_cxx_o_aux(sfilepath, failmsg, expect_pass); + return build_check_cxx_o(sfilepath.c_str()); } void header_check(const char *hdrname) { - std::ofstream srcfile("test.c"); + std::ofstream srcfile("test.cpp"); ATF_REQUIRE(srcfile); srcfile << "#include <" << hdrname << ">\n"; srcfile.close(); const std::string failmsg = std::string("Header check failed; ") + hdrname + " is not self-contained"; - build_check_cxx_o_aux(atf::fs::path("test.c"), failmsg.c_str(), true); + if (!build_check_cxx_o("test.cpp")) + ATF_FAIL(failmsg); } atf::fs::path -get_process_helpers_path(const atf::tests::tc& tc) +get_process_helpers_path(const atf::tests::tc& tc, bool is_detail) { - return atf::fs::path(tc.get_config_var("srcdir")) / - ".." / "atf-c" / "detail" / "process_helpers"; -} - -void -test_helpers_detail::check_equal(const char* expected[], - const string_vector& actual) -{ - const char** expected_iter = expected; - string_vector::const_iterator actual_iter = actual.begin(); - - bool equals = true; - while (equals && *expected_iter != NULL && actual_iter != actual.end()) { - if (*expected_iter != *actual_iter) { - equals = false; - } else { - expected_iter++; - actual_iter++; - } - } - if (equals && ((*expected_iter == NULL && actual_iter != actual.end()) || - (*expected_iter != NULL && actual_iter == actual.end()))) - equals = false; - - if (!equals) { - std::cerr << "EXPECTED:\n"; - for (expected_iter = expected; *expected_iter != NULL; expected_iter++) - std::cerr << *expected_iter << "\n"; - - std::cerr << "ACTUAL:\n"; - for (actual_iter = actual.begin(); actual_iter != actual.end(); - actual_iter++) - std::cerr << *actual_iter << "\n"; - - ATF_FAIL("Expected results differ to actual values"); + const char* helper = "detail/process_helpers"; + if (atf_c_tests_base == NULL) { + if (is_detail) + return atf::fs::path(tc.get_config_var("srcdir")) / + ".." / ".." / "atf-c" / helper; + else + return atf::fs::path(tc.get_config_var("srcdir")) / + ".." / "atf-c" / helper; + } else { + return atf::fs::path(atf_c_tests_base) / helper; } } diff --git a/atf-c++/detail/test_helpers.hpp b/atf-c++/detail/test_helpers.hpp index 4a39331de4d4..342a07dba9ce 100644 --- a/atf-c++/detail/test_helpers.hpp +++ b/atf-c++/detail/test_helpers.hpp @@ -40,9 +40,7 @@ #include "../macros.hpp" #include "../tests.hpp" -#include "parser.hpp" #include "process.hpp" -#include "text.hpp" #define HEADER_TC(name, hdrname) \ ATF_TEST_CASE(name); \ @@ -64,18 +62,8 @@ } \ ATF_TEST_CASE_BODY(name) \ { \ - build_check_cxx_o(*this, sfile, failmsg, true); \ - } - -#define BUILD_TC_FAIL(name, sfile, descr, failmsg) \ - ATF_TEST_CASE(name); \ - ATF_TEST_CASE_HEAD(name) \ - { \ - set_md_var("descr", descr); \ - } \ - ATF_TEST_CASE_BODY(name) \ - { \ - build_check_cxx_o(*this, sfile, failmsg, false); \ + if (!build_check_cxx_o_srcdir(*this, sfile)) \ + ATF_FAIL(failmsg); \ } namespace atf { @@ -85,8 +73,9 @@ class tc; } void header_check(const char*); -void build_check_cxx_o(const atf::tests::tc&, const char*, const char*, bool); -atf::fs::path get_process_helpers_path(const atf::tests::tc&); +bool build_check_cxx_o(const char*); +bool build_check_cxx_o_srcdir(const atf::tests::tc&, const char*); +atf::fs::path get_process_helpers_path(const atf::tests::tc&, bool); struct run_h_tc_data { const atf::tests::vars_map& m_config; @@ -120,45 +109,3 @@ run_h_tc(atf::tests::vars_map config = atf::tests::vars_map()) const atf::process::status s = c.wait(); ATF_REQUIRE(s.exited()); } - -namespace test_helpers_detail { - -typedef std::vector< std::string > string_vector; - -template< class Reader > -std::pair< string_vector, string_vector > -do_read(const char* input) -{ - string_vector errors; - - std::istringstream is(input); - Reader reader(is); - try { - reader.read(); - } catch (const atf::parser::parse_errors& pes) { - for (std::vector< atf::parser::parse_error >::const_iterator iter = - pes.begin(); iter != pes.end(); iter++) - errors.push_back(*iter); - } catch (const atf::parser::parse_error& pe) { - ATF_FAIL("Raised a lonely parse error: " + - atf::text::to_string(pe.first) + ": " + pe.second); - } - - return std::make_pair(reader.m_calls, errors); -} - -void check_equal(const char*[], const string_vector&); - -} // namespace test_helpers_detail - -template< class Reader > -void -do_parser_test(const char* input, const char* exp_calls[], - const char* exp_errors[]) -{ - const std::pair< test_helpers_detail::string_vector, - test_helpers_detail::string_vector > - actual = test_helpers_detail::do_read< Reader >(input); - test_helpers_detail::check_equal(exp_calls, actual.first); - test_helpers_detail::check_equal(exp_errors, actual.second); -} diff --git a/atf-c++/detail/version_helper.cpp b/atf-c++/detail/version_helper.cpp new file mode 100644 index 000000000000..b1101c92a009 --- /dev/null +++ b/atf-c++/detail/version_helper.cpp @@ -0,0 +1,41 @@ +// Copyright 2014 Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of Google Inc. nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#if defined(HAVE_CONFIG_H) +#include "bconfig.h" +#endif + +#include +#include + +int +main(void) +{ + std::cout << PACKAGE_VERSION << "\n"; + return EXIT_SUCCESS; +} diff --git a/atf-c++/macros_test.cpp b/atf-c++/macros_test.cpp index 67e41061c8b0..4113ed0e61ce 100644 --- a/atf-c++/macros_test.cpp +++ b/atf-c++/macros_test.cpp @@ -763,11 +763,30 @@ BUILD_TC(use, "macros_hpp_test.cpp", "do not cause syntax errors when used", "Build of macros_hpp_test.cpp failed; some macros in " "atf-c++/macros.hpp are broken"); -BUILD_TC_FAIL(detect_unused_tests, "unused_test.cpp", - "Tests that defining an unused test case raises a warning (and thus " - "an error)", - "Build of unused_test.cpp passed; unused test cases are not properly " - "detected"); + +ATF_TEST_CASE(detect_unused_tests); +ATF_TEST_CASE_HEAD(detect_unused_tests) +{ + set_md_var("descr", + "Tests that defining an unused test case raises a warning (and " + "thus an error)"); +} +ATF_TEST_CASE_BODY(detect_unused_tests) +{ + const char* validate_compiler = + "class test_class { public: int dummy; };\n" + "#define define_unused static test_class unused\n" + "define_unused;\n"; + + atf::utils::create_file("compiler_test.cpp", validate_compiler); + if (build_check_cxx_o("compiler_test.cpp")) + expect_fail("Compiler does not raise a warning on an unused " + "static global variable declared by a macro"); + + 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"); +} // ------------------------------------------------------------------------ // Main. diff --git a/atf-c++/pkg_config_test.sh b/atf-c++/pkg_config_test.sh index d99f0104f6c3..d0b06569ac21 100644 --- a/atf-c++/pkg_config_test.sh +++ b/atf-c++/pkg_config_test.sh @@ -43,10 +43,8 @@ require_pc() check_version() { - atf_check -s eq:0 -o save:stdout -e empty -x \ - "atf-version | head -n 1 | cut -d ' ' -f 4" - ver1=$(cat stdout) - echo "Version reported by atf-version: ${ver1}" + ver1=$($(atf_get_srcdir)/detail/version_helper) + echo "Version reported by builtin PACKAGE_VERSION: ${ver1}" atf_check -s eq:0 -o save:stdout -e empty pkg-config --modversion "${1}" ver2=$(cat stdout) @@ -59,7 +57,7 @@ atf_test_case version version_head() { atf_set "descr" "Checks that the version in atf-c++ is correct" - atf_set "require.progs" "atf-version pkg-config" + atf_set "require.progs" "pkg-config" } version_body() { diff --git a/atf-c++/tests.cpp b/atf-c++/tests.cpp index 2c351fcb3dbb..801ed7cd49c8 100644 --- a/atf-c++/tests.cpp +++ b/atf-c++/tests.cpp @@ -55,7 +55,6 @@ extern "C" { #include "atf-c/utils.h" } -#include "noncopyable.hpp" #include "tests.hpp" #include "detail/application.hpp" @@ -63,7 +62,6 @@ extern "C" { #include "detail/env.hpp" #include "detail/exceptions.hpp" #include "detail/fs.hpp" -#include "detail/parser.hpp" #include "detail/sanity.hpp" #include "detail/text.hpp" @@ -79,12 +77,7 @@ detail::atf_tp_writer::atf_tp_writer(std::ostream& os) : m_os(os), m_is_first(true) { - atf::parser::headers_map hm; - atf::parser::attrs_map ct_attrs; - ct_attrs["version"] = "1"; - hm["Content-Type"] = atf::parser::header_entry("Content-Type", - "application/X-atf-tp", ct_attrs); - atf::parser::write_headers(hm, m_os); + m_os << "Content-Type: application/X-atf-tp; version=\"1\"\n\n"; } void @@ -129,7 +122,13 @@ detail::match(const std::string& regexp, const std::string& str) static std::map< atf_tc_t*, impl::tc* > wraps; static std::map< const atf_tc_t*, const impl::tc* > cwraps; -struct impl::tc_impl : atf::noncopyable { +struct impl::tc_impl { +private: + // Non-copyable. + tc_impl(const tc_impl&); + tc_impl& operator=(const tc_impl&); + +public: std::string m_ident; atf_tc_t m_tc; bool m_has_cleanup; @@ -435,7 +434,7 @@ const char* tp::m_description = "This is an independent atf test program."; tp::tp(void (*add_tcs)(tc_vector&)) : - app(m_description, "atf-test-program(1)", "atf(7)", false), + app(m_description, "atf-test-program(1)"), m_lflag(false), m_resfile("/dev/stdout"), m_srcdir("."), diff --git a/atf-c++/tests.hpp b/atf-c++/tests.hpp index 22a2a8706a9a..4c8ca913d97b 100644 --- a/atf-c++/tests.hpp +++ b/atf-c++/tests.hpp @@ -38,8 +38,6 @@ extern "C" { #include } -#include - namespace atf { namespace tests { @@ -74,7 +72,11 @@ typedef std::map< std::string, std::string > vars_map; struct tc_impl; -class tc : noncopyable { +class tc { + // Non-copyable. + tc(const tc&); + tc& operator=(const tc&); + std::auto_ptr< tc_impl > pimpl; protected: diff --git a/atf-c++/tests_test.cpp b/atf-c++/tests_test.cpp index 63ab2ef91a5d..5f19a4e176c0 100644 --- a/atf-c++/tests_test.cpp +++ b/atf-c++/tests_test.cpp @@ -40,8 +40,8 @@ extern "C" { #include "macros.hpp" -#include "detail/parser.hpp" #include "detail/test_helpers.hpp" +#include "detail/text.hpp" // ------------------------------------------------------------------------ // Tests for the "atf_tp_writer" class. diff --git a/atf-c/Makefile.am.inc b/atf-c/Makefile.am.inc index b813ec4bc1d4..d32e978c71fd 100644 --- a/atf-c/Makefile.am.inc +++ b/atf-c/Makefile.am.inc @@ -45,28 +45,22 @@ libatf_c_la_SOURCES = atf-c/build.c \ atf-c/utils.c \ atf-c/utils.h nodist_libatf_c_la_SOURCES = atf-c/defs.h -libatf_c_la_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \ - "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ +libatf_c_la_CPPFLAGS = "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \ "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \ "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \ "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \ "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \ - "-DATF_CONFDIR=\"$(atf_confdir)\"" \ "-DATF_INCLUDEDIR=\"$(includedir)\"" \ - "-DATF_LIBDIR=\"$(libdir)\"" \ "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \ - "-DATF_MACHINE=\"$(atf_machine)\"" \ - "-DATF_M4=\"$(ATF_M4)\"" \ "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \ "-DATF_SHELL=\"$(ATF_SHELL)\"" \ - "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \ - -I$(srcdir)/atf-c + "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" libatf_c_la_LDFLAGS = -version-info 0:0:0 # XXX For some reason, the nodist line above does not work as expected. # Work this problem around. -dist-hook: kill-defs-h +DIST_HOOKS += kill-defs-h kill-defs-h: rm -f $(distdir)/atf-c/defs.h diff --git a/atf-c/config.c b/atf-c/config.c index f1047f05583e..3c2c8a9a61eb 100644 --- a/atf-c/config.c +++ b/atf-c/config.c @@ -45,18 +45,14 @@ static struct var { const char *value; bool can_be_empty; } vars[] = { - { "atf_arch", ATF_ARCH, NULL, false, }, { "atf_build_cc", ATF_BUILD_CC, NULL, false, }, { "atf_build_cflags", ATF_BUILD_CFLAGS, NULL, true, }, { "atf_build_cpp", ATF_BUILD_CPP, NULL, false, }, { "atf_build_cppflags", ATF_BUILD_CPPFLAGS, NULL, true, }, { "atf_build_cxx", ATF_BUILD_CXX, NULL, false, }, { "atf_build_cxxflags", ATF_BUILD_CXXFLAGS, NULL, true, }, - { "atf_confdir", ATF_CONFDIR, NULL, false, }, { "atf_includedir", ATF_INCLUDEDIR, NULL, false, }, - { "atf_libdir", ATF_LIBDIR, NULL, false, }, { "atf_libexecdir", ATF_LIBEXECDIR, NULL, false, }, - { "atf_machine", ATF_MACHINE, NULL, false, }, { "atf_pkgdatadir", ATF_PKGDATADIR, NULL, false, }, { "atf_shell", ATF_SHELL, NULL, false, }, { "atf_workdir", ATF_WORKDIR, NULL, false, }, diff --git a/atf-c/config_test.c b/atf-c/config_test.c index a21d68fe58cc..aed181438b59 100644 --- a/atf-c/config_test.c +++ b/atf-c/config_test.c @@ -44,18 +44,14 @@ static struct varnames { const char *uc; bool can_be_empty; } all_vars[] = { - { "atf_arch", "ATF_ARCH", false }, { "atf_build_cc", "ATF_BUILD_CC", false }, { "atf_build_cflags", "ATF_BUILD_CFLAGS", true }, { "atf_build_cpp", "ATF_BUILD_CPP", false }, { "atf_build_cppflags", "ATF_BUILD_CPPFLAGS", true }, { "atf_build_cxx", "ATF_BUILD_CXX", false }, { "atf_build_cxxflags", "ATF_BUILD_CXXFLAGS", true }, - { "atf_confdir", "ATF_CONFDIR", false }, { "atf_includedir", "ATF_INCLUDEDIR", false }, - { "atf_libdir", "ATF_LIBDIR", false }, { "atf_libexecdir", "ATF_LIBEXECDIR", false }, - { "atf_machine", "ATF_MACHINE", false }, { "atf_pkgdatadir", "ATF_PKGDATADIR", false }, { "atf_shell", "ATF_SHELL", false }, { "atf_workdir", "ATF_WORKDIR", false }, diff --git a/atf-c/detail/Makefile.am.inc b/atf-c/detail/Makefile.am.inc index 20a8dc57c205..8116a24e8215 100644 --- a/atf-c/detail/Makefile.am.inc +++ b/atf-c/detail/Makefile.am.inc @@ -96,4 +96,7 @@ tests_atf_c_detail_PROGRAMS += atf-c/detail/user_test atf_c_detail_user_test_SOURCES = atf-c/detail/user_test.c atf_c_detail_user_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la +tests_atf_c_detail_PROGRAMS += atf-c/detail/version_helper +atf_c_detail_version_helper_SOURCES = atf-c/detail/version_helper.c + # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/atf-c/detail/test_helpers.c b/atf-c/detail/test_helpers.c index aa64c12de405..aacbf32b3746 100644 --- a/atf-c/detail/test_helpers.c +++ b/atf-c/detail/test_helpers.c @@ -43,10 +43,8 @@ #include "process.h" #include "test_helpers.h" -static -void -build_check_c_o_aux(const char *path, const char *failmsg, - const bool expect_pass) +bool +build_check_c_o(const char *path) { bool success; atf_dynstr_t iflag; @@ -63,20 +61,19 @@ build_check_c_o_aux(const char *path, const char *failmsg, atf_dynstr_fini(&iflag); - if ((expect_pass && !success) || (!expect_pass && success)) - atf_tc_fail("%s", failmsg); + return success; } -void -build_check_c_o(const atf_tc_t *tc, const char *sfile, const char *failmsg, - const bool expect_pass) +bool +build_check_c_o_srcdir(const atf_tc_t *tc, const char *sfile) { 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, expect_pass); + const bool result = build_check_c_o(atf_fs_path_cstring(&path)); atf_fs_path_fini(&path); + return result; } void @@ -93,7 +90,8 @@ 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, true); + if (!build_check_c_o("test.c")) + atf_tc_fail("%s", failmsg); } void diff --git a/atf-c/detail/test_helpers.h b/atf-c/detail/test_helpers.h index 5df034fb42ad..3037ba4189c8 100644 --- a/atf-c/detail/test_helpers.h +++ b/atf-c/detail/test_helpers.h @@ -63,21 +63,12 @@ struct atf_fs_path; } \ ATF_TC_BODY(name, tc) \ { \ - build_check_c_o(tc, sfile, failmsg, true); \ + if (!build_check_c_o_srcdir(tc, sfile)) \ + atf_tc_fail("%s", failmsg); \ } -#define BUILD_TC_FAIL(name, sfile, descr, failmsg) \ - ATF_TC(name); \ - ATF_TC_HEAD(name, tc) \ - { \ - atf_tc_set_md_var(tc, "descr", descr); \ - } \ - ATF_TC_BODY(name, tc) \ - { \ - build_check_c_o(tc, sfile, failmsg, false); \ - } - -void build_check_c_o(const atf_tc_t *, const char *, const char *, const bool); +bool build_check_c_o(const char *); +bool build_check_c_o_srcdir(const atf_tc_t *, const char *); void header_check(const char *); void get_process_helpers_path(const atf_tc_t *, const bool, struct atf_fs_path *); diff --git a/atf-c/detail/version_helper.c b/atf-c/detail/version_helper.c new file mode 100644 index 000000000000..b75ff364b5a7 --- /dev/null +++ b/atf-c/detail/version_helper.c @@ -0,0 +1,43 @@ +/* + * Copyright 2014 Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Google Inc. nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#if defined(HAVE_CONFIG_H) +#include "bconfig.h" +#endif + +#include +#include + +int +main(void) +{ + printf("%s\n", PACKAGE_VERSION); + return EXIT_SUCCESS; +} diff --git a/atf-c/macros_test.c b/atf-c/macros_test.c index f077a273d73d..adfc77c0ba0d 100644 --- a/atf-c/macros_test.c +++ b/atf-c/macros_test.c @@ -843,11 +843,30 @@ BUILD_TC(use, "macros_h_test.c", "do not cause syntax errors when used", "Build of macros_h_test.c failed; some macros in atf-c/macros.h " "are broken"); -BUILD_TC_FAIL(detect_unused_tests, "unused_test.c", - "Tests that defining an unused test case raises a warning (and thus " - "an error)", - "Build of unused_test.c passed; unused test cases are not properly " - "detected"); + +ATF_TC(detect_unused_tests); +ATF_TC_HEAD(detect_unused_tests, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Tests that defining an unused test case raises a " + "warning (and thus an error)"); +} +ATF_TC_BODY(detect_unused_tests, tc) +{ + const char* validate_compiler = + "struct test_struct { int dummy; };\n" + "#define define_unused static struct test_struct unused\n" + "define_unused;\n"; + + atf_utils_create_file("compiler_test.c", "%s", validate_compiler); + if (build_check_c_o("compiler_test.c")) + atf_tc_expect_fail("Compiler does not raise a warning on an unused " + "static global variable declared by a macro"); + + 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"); +} /* --------------------------------------------------------------------- * Main. diff --git a/atf-c/pkg_config_test.sh b/atf-c/pkg_config_test.sh index efeae8323695..d913ec91012d 100644 --- a/atf-c/pkg_config_test.sh +++ b/atf-c/pkg_config_test.sh @@ -43,10 +43,8 @@ require_pc() check_version() { - atf_check -s eq:0 -o save:stdout -e empty -x \ - "atf-version | head -n 1 | cut -d ' ' -f 4" - ver1=$(cat stdout) - echo "Version reported by atf-version: ${ver1}" + ver1=$($(atf_get_srcdir)/detail/version_helper) + echo "Version reported by builtin PACKAGE_VERSION: ${ver1}" atf_check -s eq:0 -o save:stdout -e empty pkg-config --modversion "${1}" ver2=$(cat stdout) @@ -59,7 +57,7 @@ atf_test_case version version_head() { atf_set "descr" "Checks that the version in atf-c is correct" - atf_set "require.progs" "atf-version pkg-config" + atf_set "require.progs" "pkg-config" } version_body() { diff --git a/atf-config/Atffile b/atf-config/Atffile deleted file mode 100644 index 146211e000d4..000000000000 --- a/atf-config/Atffile +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: *_test diff --git a/atf-config/Kyuafile b/atf-config/Kyuafile deleted file mode 100644 index 8ba4da828857..000000000000 --- a/atf-config/Kyuafile +++ /dev/null @@ -1,5 +0,0 @@ -syntax("kyuafile", 1) - -test_suite("atf") - -atf_test_program{name="integration_test"} diff --git a/atf-config/Makefile.am.inc b/atf-config/Makefile.am.inc deleted file mode 100644 index 0f32778aad61..000000000000 --- a/atf-config/Makefile.am.inc +++ /dev/null @@ -1,48 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -bin_PROGRAMS += atf-config/atf-config -atf_config_atf_config_SOURCES = atf-config/atf-config.cpp -atf_config_atf_config_LDADD = $(ATF_CXX_LIBS) -dist_man_MANS += atf-config/atf-config.1 - -tests_atf_config_DATA = atf-config/Atffile \ - atf-config/Kyuafile -tests_atf_configdir = $(pkgtestsdir)/atf-config -EXTRA_DIST += $(tests_atf_config_DATA) - -tests_atf_config_SCRIPTS = atf-config/integration_test -CLEANFILES += atf-config/integration_test -EXTRA_DIST += atf-config/integration_test.sh -atf-config/integration_test: $(srcdir)/atf-config/integration_test.sh - test -d atf-config || mkdir -p atf-config - @src="$(srcdir)/atf-config/integration_test.sh"; \ - dst="atf-config/integration_test"; $(BUILD_SH_TP) - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/atf-report/Atffile b/atf-report/Atffile deleted file mode 100644 index 146211e000d4..000000000000 --- a/atf-report/Atffile +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: *_test diff --git a/atf-report/Kyuafile b/atf-report/Kyuafile deleted file mode 100644 index d69e3fa54dfe..000000000000 --- a/atf-report/Kyuafile +++ /dev/null @@ -1,6 +0,0 @@ -syntax("kyuafile", 1) - -test_suite("atf") - -atf_test_program{name="integration_test"} -atf_test_program{name="reader_test"} diff --git a/atf-report/Makefile.am.inc b/atf-report/Makefile.am.inc deleted file mode 100644 index e62275e64ee3..000000000000 --- a/atf-report/Makefile.am.inc +++ /dev/null @@ -1,80 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -bin_PROGRAMS += atf-report/atf-report -atf_report_atf_report_SOURCES = atf-report/atf-report.cpp \ - atf-report/reader.cpp \ - atf-report/reader.hpp -atf_report_atf_report_LDADD = $(ATF_CXX_LIBS) -dist_man_MANS += atf-report/atf-report.1 - -cssdir = $(atf_cssdir) -css_DATA = atf-report/tests-results.css -EXTRA_DIST += $(css_DATA) - -dtddir = $(atf_dtddir) -dtd_DATA = atf-report/tests-results.dtd -EXTRA_DIST += $(dtd_DATA) - -xsldir = $(atf_xsldir) -xsl_DATA = atf-report/tests-results.xsl -EXTRA_DIST += $(xsl_DATA) - -tests_atf_report_DATA = atf-report/Atffile \ - atf-report/Kyuafile -tests_atf_reportdir = $(pkgtestsdir)/atf-report -EXTRA_DIST += $(tests_atf_report_DATA) - -tests_atf_report_PROGRAMS = atf-report/fail_helper -atf_report_fail_helper_SOURCES = atf-report/fail_helper.cpp -atf_report_fail_helper_LDADD = $(ATF_CXX_LIBS) - -tests_atf_report_PROGRAMS += atf-report/misc_helpers -atf_report_misc_helpers_SOURCES = atf-report/misc_helpers.cpp -atf_report_misc_helpers_LDADD = $(ATF_CXX_LIBS) - -tests_atf_report_PROGRAMS += atf-report/pass_helper -atf_report_pass_helper_SOURCES = atf-report/pass_helper.cpp -atf_report_pass_helper_LDADD = $(ATF_CXX_LIBS) - -tests_atf_report_SCRIPTS = atf-report/integration_test -CLEANFILES += atf-report/integration_test -EXTRA_DIST += atf-report/integration_test.sh -atf-report/integration_test: $(srcdir)/atf-report/integration_test.sh - test -d atf-report || mkdir -p atf-report - @src="$(srcdir)/atf-report/integration_test.sh"; \ - dst="atf-report/integration_test"; $(BUILD_SH_TP) - -tests_atf_report_PROGRAMS += atf-report/reader_test -atf_report_reader_test_SOURCES = atf-report/reader_test.cpp \ - atf-report/reader.cpp -atf_report_reader_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail -atf_report_reader_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/atf-run/Atffile b/atf-run/Atffile deleted file mode 100644 index 146211e000d4..000000000000 --- a/atf-run/Atffile +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: *_test diff --git a/atf-run/Kyuafile b/atf-run/Kyuafile deleted file mode 100644 index 305d699e165e..000000000000 --- a/atf-run/Kyuafile +++ /dev/null @@ -1,13 +0,0 @@ -syntax("kyuafile", 1) - -test_suite("atf") - -atf_test_program{name="atffile_test"} -atf_test_program{name="config_test"} -atf_test_program{name="fs_test"} -atf_test_program{name="integration_test"} -atf_test_program{name="io_test"} -atf_test_program{name="requirements_test"} -atf_test_program{name="signals_test"} -atf_test_program{name="test_program_test"} -atf_test_program{name="user_test"} diff --git a/atf-run/Makefile.am.inc b/atf-run/Makefile.am.inc deleted file mode 100644 index 7eb8333b31c0..000000000000 --- a/atf-run/Makefile.am.inc +++ /dev/null @@ -1,150 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -bin_PROGRAMS += atf-run/atf-run -atf_run_atf_run_CPPFLAGS = "-DGDB=\"$(GDB)\"" -atf_run_atf_run_SOURCES = atf-run/atf-run.cpp \ - atf-run/atffile.cpp \ - atf-run/atffile.hpp \ - atf-run/config.cpp \ - atf-run/config.hpp \ - atf-run/fs.cpp \ - atf-run/fs.hpp \ - atf-run/io.cpp \ - atf-run/io.hpp \ - atf-run/requirements.cpp \ - atf-run/requirements.hpp \ - atf-run/signals.cpp \ - atf-run/signals.hpp \ - atf-run/test-program.cpp \ - atf-run/test-program.hpp \ - atf-run/timer.cpp \ - atf-run/timer.hpp \ - atf-run/user.cpp \ - atf-run/user.hpp -atf_run_atf_run_LDADD = $(ATF_CXX_LIBS) -dist_man_MANS += atf-run/atf-run.1 - -tests_atf_run_DATA = atf-run/Atffile \ - atf-run/Kyuafile -tests_atf_rundir = $(pkgtestsdir)/atf-run -EXTRA_DIST += $(tests_atf_run_DATA) - -tests_atf_run_PROGRAMS = atf-run/atffile_test -atf_run_atffile_test_SOURCES = atf-run/atffile_test.cpp \ - atf-run/atffile.cpp -atf_run_atffile_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail -atf_run_atffile_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/bad_metadata_helper -atf_run_bad_metadata_helper_SOURCES = atf-run/bad_metadata_helper.c -atf_run_bad_metadata_helper_LDADD = libatf-c.la - -tests_atf_run_PROGRAMS += atf-run/config_test -atf_run_config_test_SOURCES = atf-run/config_test.cpp \ - atf-run/config.cpp -atf_run_config_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail -atf_run_config_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/expect_helpers -atf_run_expect_helpers_SOURCES = atf-run/expect_helpers.c -atf_run_expect_helpers_LDADD = libatf-c.la - -tests_atf_run_PROGRAMS += atf-run/fs_test -atf_run_fs_test_SOURCES = atf-run/fs_test.cpp \ - atf-run/fs.cpp \ - atf-run/user.cpp -atf_run_fs_test_LDADD = $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/io_test -atf_run_io_test_SOURCES = atf-run/io_test.cpp \ - atf-run/io.cpp \ - atf-run/signals.cpp -atf_run_io_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/misc_helpers -atf_run_misc_helpers_SOURCES = atf-run/misc_helpers.cpp -atf_run_misc_helpers_LDADD = $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/pass_helper -atf_run_pass_helper_SOURCES = atf-run/pass_helper.cpp -atf_run_pass_helper_LDADD = $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/several_tcs_helper -atf_run_several_tcs_helper_SOURCES = atf-run/several_tcs_helper.c -atf_run_several_tcs_helper_LDADD = libatf-c.la - -tests_atf_run_PROGRAMS += atf-run/requirements_test -atf_run_requirements_test_SOURCES = atf-run/requirements_test.cpp \ - atf-run/requirements.cpp \ - atf-run/user.cpp -atf_run_requirements_test_LDADD = $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/signals_test -atf_run_signals_test_SOURCES = atf-run/signals_test.cpp atf-run/signals.cpp -atf_run_signals_test_LDADD = $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/test_program_test -atf_run_test_program_test_SOURCES = atf-run/test_program_test.cpp \ - atf-run/fs.cpp \ - atf-run/io.cpp \ - atf-run/requirements.cpp \ - atf-run/signals.cpp \ - atf-run/test-program.cpp \ - atf-run/timer.cpp \ - atf-run/user.cpp -atf_run_test_program_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail -atf_run_test_program_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/user_test -atf_run_user_test_SOURCES = atf-run/user_test.cpp atf-run/user.cpp -atf_run_user_test_LDADD = $(ATF_CXX_LIBS) - -tests_atf_run_PROGRAMS += atf-run/zero_tcs_helper -atf_run_zero_tcs_helper_SOURCES = atf-run/zero_tcs_helper.c -atf_run_zero_tcs_helper_LDADD = libatf-c.la - -tests_atf_run_SCRIPTS = atf-run/integration_test -CLEANFILES += atf-run/integration_test -EXTRA_DIST += atf-run/integration_test.sh -atf-run/integration_test: $(srcdir)/atf-run/integration_test.sh - test -d atf-run || mkdir -p atf-run - @src="$(srcdir)/atf-run/integration_test.sh"; \ - dst="atf-run/integration_test"; $(BUILD_SH_TP) - -hooksdir = $(pkgdatadir) -hooks_DATA = atf-run/share/atf-run.hooks -EXTRA_DIST += $(hooks_DATA) - -egdir = $(atf_egdir) -eg_DATA = atf-run/sample/atf-run.hooks -eg_DATA += atf-run/sample/common.conf -EXTRA_DIST += $(eg_DATA) - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/atf-run/fs.cpp b/atf-run/fs.cpp deleted file mode 100644 index e84a90da73a3..000000000000 --- a/atf-run/fs.cpp +++ /dev/null @@ -1,265 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(HAVE_CONFIG_H) -#include "bconfig.h" -#endif - -extern "C" { -#include -#include -#include -#include - -#include -} - -#include -#include -#include - -#include "atf-c++/detail/auto_array.hpp" -#include "atf-c++/detail/process.hpp" -#include "atf-c++/detail/sanity.hpp" - -#include "fs.hpp" -#include "user.hpp" - -namespace impl = atf::atf_run; -#define IMPL_NAME "atf::atf_run" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -static void cleanup_aux(const atf::fs::path&, dev_t, bool); -static void cleanup_aux_dir(const atf::fs::path&, const atf::fs::file_info&, - bool); -static void do_unmount(const atf::fs::path&); - -// The cleanup routines below are tricky: they are executed immediately after -// a test case's death, and after we have forcibly killed any stale processes. -// However, even if the processes are dead, this does not mean that the file -// system we are scanning is stable. In particular, if the test case has -// mounted file systems through fuse/puffs, the fact that the processes died -// does not mean that the file system is truly unmounted. -// -// The code below attempts to cope with this by catching errors and either -// ignoring them or retrying the actions on the same file/directory a few times -// before giving up. -static const int max_retries = 5; -static const int retry_delay_in_seconds = 1; - -// The erase parameter in this routine is to control nested mount points. -// We want to descend into a mount point to unmount anything that is -// mounted under it, but we do not want to delete any files while doing -// this traversal. In other words, we erase files until we cross the -// first mount point, and after that point we only scan and unmount. -static -void -cleanup_aux(const atf::fs::path& p, dev_t parent_device, bool erase) -{ - try { - atf::fs::file_info fi(p); - - if (fi.get_type() == atf::fs::file_info::dir_type) - cleanup_aux_dir(p, fi, fi.get_device() == parent_device); - - if (fi.get_device() != parent_device) - do_unmount(p); - - if (erase) { - if (fi.get_type() == atf::fs::file_info::dir_type) - atf::fs::rmdir(p); - else - atf::fs::remove(p); - } - } catch (const atf::system_error& e) { - if (e.code() != ENOENT && e.code() != ENOTDIR) - throw e; - } -} - -static -void -cleanup_aux_dir(const atf::fs::path& p, const atf::fs::file_info& fi, - bool erase) -{ - if (erase && ((fi.get_mode() & S_IRWXU) != S_IRWXU)) { - int retries = max_retries; -retry_chmod: - if (chmod(p.c_str(), fi.get_mode() | S_IRWXU) == -1) { - if (retries > 0) { - retries--; - ::sleep(retry_delay_in_seconds); - goto retry_chmod; - } else { - throw atf::system_error(IMPL_NAME "::cleanup(" + - p.str() + ")", "chmod(2) failed", - errno); - } - } - } - - std::set< std::string > subdirs; - { - bool ok = false; - int retries = max_retries; - while (!ok) { - INV(retries > 0); - try { - const atf::fs::directory d(p); - subdirs = d.names(); - ok = true; - } catch (const atf::system_error& e) { - retries--; - if (retries == 0) - throw e; - ::sleep(retry_delay_in_seconds); - } - } - INV(ok); - } - - for (std::set< std::string >::const_iterator iter = subdirs.begin(); - iter != subdirs.end(); iter++) { - const std::string& name = *iter; - if (name != "." && name != "..") - cleanup_aux(p / name, fi.get_device(), erase); - } -} - -static -void -do_unmount(const atf::fs::path& in_path) -{ - // At least, FreeBSD's unmount(2) requires the path to be absolute. - // Let's make it absolute in all cases just to be safe that this does - // not affect other systems. - const atf::fs::path& abs_path = in_path.is_absolute() ? - in_path : in_path.to_absolute(); - -#if defined(HAVE_UNMOUNT) - int retries = max_retries; -retry_unmount: - if (unmount(abs_path.c_str(), 0) == -1) { - if (errno == EBUSY && retries > 0) { - retries--; - ::sleep(retry_delay_in_seconds); - goto retry_unmount; - } else { - throw atf::system_error(IMPL_NAME "::cleanup(" + in_path.str() + - ")", "unmount(2) failed", errno); - } - } -#else - // We could use umount(2) instead if it was available... but - // trying to do so under, e.g. Linux, is a nightmare because we - // also have to update /etc/mtab to match what we did. It is - // satf::fser to just leave the system-specific umount(8) tool deal - // with it, at least for now. - - const atf::fs::path prog("umount"); - atf::process::argv_array argv("umount", abs_path.c_str(), NULL); - - atf::process::status s = atf::process::exec(prog, argv, - atf::process::stream_inherit(), atf::process::stream_inherit()); - if (!s.exited() || s.exitstatus() != EXIT_SUCCESS) - throw std::runtime_error("Call to unmount failed"); -#endif -} - -// ------------------------------------------------------------------------ -// The "temp_dir" class. -// ------------------------------------------------------------------------ - -impl::temp_dir::temp_dir(const atf::fs::path& p) -{ - atf::auto_array< char > buf(new char[p.str().length() + 1]); - std::strcpy(buf.get(), p.c_str()); - if (::mkdtemp(buf.get()) == NULL) - throw system_error(IMPL_NAME "::temp_dir::temp_dir(" + - p.str() + ")", "mkdtemp(3) failed", - errno); - - m_path.reset(new atf::fs::path(buf.get())); -} - -impl::temp_dir::~temp_dir(void) -{ - cleanup(*m_path); -} - -const atf::fs::path& -impl::temp_dir::get_path(void) - const -{ - return *m_path; -} - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -atf::fs::path -impl::change_directory(const atf::fs::path& dir) -{ - atf::fs::path olddir = get_current_dir(); - - if (olddir != dir) { - if (::chdir(dir.c_str()) == -1) - throw system_error(IMPL_NAME "::chdir(" + dir.str() + ")", - "chdir(2) failed", errno); - } - - return olddir; -} - -void -impl::cleanup(const atf::fs::path& p) -{ - atf::fs::file_info fi(p); - cleanup_aux(p, fi.get_device(), true); -} - -atf::fs::path -impl::get_current_dir(void) -{ - std::auto_ptr< char > cwd; -#if defined(HAVE_GETCWD_DYN) - cwd.reset(getcwd(NULL, 0)); -#else - cwd.reset(getcwd(NULL, MAXPATHLEN)); -#endif - if (cwd.get() == NULL) - throw atf::system_error(IMPL_NAME "::get_current_dir()", - "getcwd() failed", errno); - - return atf::fs::path(cwd.get()); -} diff --git a/atf-run/fs_test.cpp b/atf-run/fs_test.cpp deleted file mode 100644 index f03045eb6131..000000000000 --- a/atf-run/fs_test.cpp +++ /dev/null @@ -1,260 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include -} - -#include -#include - -#include "atf-c++/macros.hpp" - -#include "atf-c++/detail/exceptions.hpp" -#include "atf-c++/detail/fs.hpp" - -#include "fs.hpp" -#include "user.hpp" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -static -void -create_file(const char *name) -{ - std::ofstream os(name); - os.close(); -} - -// ------------------------------------------------------------------------ -// Test cases for the "temp_dir" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(temp_dir_raii); -ATF_TEST_CASE_HEAD(temp_dir_raii) -{ - set_md_var("descr", "Tests the RAII behavior of the temp_dir class"); -} -ATF_TEST_CASE_BODY(temp_dir_raii) -{ - using atf::atf_run::temp_dir; - - atf::fs::path t1("non-existent"); - atf::fs::path t2("non-existent"); - - { - atf::fs::path tmpl("testdir.XXXXXX"); - temp_dir td1(tmpl); - temp_dir td2(tmpl); - t1 = td1.get_path(); - t2 = td2.get_path(); - ATF_REQUIRE(t1.str().find("XXXXXX") == std::string::npos); - ATF_REQUIRE(t2.str().find("XXXXXX") == std::string::npos); - ATF_REQUIRE(t1 != t2); - ATF_REQUIRE(!atf::fs::exists(tmpl)); - ATF_REQUIRE( atf::fs::exists(t1)); - ATF_REQUIRE( atf::fs::exists(t2)); - - atf::fs::file_info fi1(t1); - ATF_REQUIRE( fi1.is_owner_readable()); - ATF_REQUIRE( fi1.is_owner_writable()); - ATF_REQUIRE( fi1.is_owner_executable()); - ATF_REQUIRE(!fi1.is_group_readable()); - ATF_REQUIRE(!fi1.is_group_writable()); - ATF_REQUIRE(!fi1.is_group_executable()); - ATF_REQUIRE(!fi1.is_other_readable()); - ATF_REQUIRE(!fi1.is_other_writable()); - ATF_REQUIRE(!fi1.is_other_executable()); - - atf::fs::file_info fi2(t2); - ATF_REQUIRE( fi2.is_owner_readable()); - ATF_REQUIRE( fi2.is_owner_writable()); - ATF_REQUIRE( fi2.is_owner_executable()); - ATF_REQUIRE(!fi2.is_group_readable()); - ATF_REQUIRE(!fi2.is_group_writable()); - ATF_REQUIRE(!fi2.is_group_executable()); - ATF_REQUIRE(!fi2.is_other_readable()); - ATF_REQUIRE(!fi2.is_other_writable()); - ATF_REQUIRE(!fi2.is_other_executable()); - } - - ATF_REQUIRE(t1.str() != "non-existent"); - ATF_REQUIRE(!atf::fs::exists(t1)); - ATF_REQUIRE(t2.str() != "non-existent"); - ATF_REQUIRE(!atf::fs::exists(t2)); -} - - -// ------------------------------------------------------------------------ -// Test cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(cleanup); -ATF_TEST_CASE_HEAD(cleanup) -{ - set_md_var("descr", "Tests the cleanup function"); -} -ATF_TEST_CASE_BODY(cleanup) -{ - using atf::atf_run::cleanup; - - ::mkdir("root", 0755); - ::mkdir("root/dir", 0755); - ::mkdir("root/dir/1", 0100); - ::mkdir("root/dir/2", 0644); - create_file("root/reg"); - - atf::fs::path p("root"); - ATF_REQUIRE(atf::fs::exists(p)); - ATF_REQUIRE(atf::fs::exists(p / "dir")); - ATF_REQUIRE(atf::fs::exists(p / "dir/1")); - ATF_REQUIRE(atf::fs::exists(p / "dir/2")); - ATF_REQUIRE(atf::fs::exists(p / "reg")); - cleanup(p); - ATF_REQUIRE(!atf::fs::exists(p)); -} - -ATF_TEST_CASE(cleanup_eacces_on_root); -ATF_TEST_CASE_HEAD(cleanup_eacces_on_root) -{ - set_md_var("descr", "Tests the cleanup function"); -} -ATF_TEST_CASE_BODY(cleanup_eacces_on_root) -{ - using atf::atf_run::cleanup; - - ::mkdir("aux", 0755); - ::mkdir("aux/root", 0755); - ATF_REQUIRE(::chmod("aux", 0555) != -1); - - try { - cleanup(atf::fs::path("aux/root")); - ATF_REQUIRE(atf::atf_run::is_root()); - } catch (const atf::system_error& e) { - ATF_REQUIRE(!atf::atf_run::is_root()); - ATF_REQUIRE_EQ(EACCES, e.code()); - } -} - -ATF_TEST_CASE(cleanup_eacces_on_subdir); -ATF_TEST_CASE_HEAD(cleanup_eacces_on_subdir) -{ - set_md_var("descr", "Tests the cleanup function"); -} -ATF_TEST_CASE_BODY(cleanup_eacces_on_subdir) -{ - using atf::atf_run::cleanup; - - ::mkdir("root", 0755); - ::mkdir("root/1", 0755); - ::mkdir("root/1/2", 0755); - ::mkdir("root/1/2/3", 0755); - ATF_REQUIRE(::chmod("root/1/2", 0555) != -1); - ATF_REQUIRE(::chmod("root/1", 0555) != -1); - - const atf::fs::path p("root"); - cleanup(p); - ATF_REQUIRE(!atf::fs::exists(p)); -} - -ATF_TEST_CASE(change_directory); -ATF_TEST_CASE_HEAD(change_directory) -{ - set_md_var("descr", "Tests the change_directory function"); -} -ATF_TEST_CASE_BODY(change_directory) -{ - using atf::atf_run::change_directory; - using atf::atf_run::get_current_dir; - - ::mkdir("files", 0755); - ::mkdir("files/dir", 0755); - create_file("files/reg"); - - const atf::fs::path old = get_current_dir(); - - ATF_REQUIRE_THROW(atf::system_error, - change_directory(atf::fs::path("files/reg"))); - ATF_REQUIRE(get_current_dir() == old); - - atf::fs::path old2 = change_directory(atf::fs::path("files")); - ATF_REQUIRE(old2 == old); - atf::fs::path old3 = change_directory(atf::fs::path("dir")); - ATF_REQUIRE(old3 == old2 / "files"); - atf::fs::path old4 = change_directory(atf::fs::path("../..")); - ATF_REQUIRE(old4 == old3 / "dir"); - ATF_REQUIRE(get_current_dir() == old); -} - -ATF_TEST_CASE(get_current_dir); -ATF_TEST_CASE_HEAD(get_current_dir) -{ - set_md_var("descr", "Tests the get_current_dir function"); -} -ATF_TEST_CASE_BODY(get_current_dir) -{ - using atf::atf_run::change_directory; - using atf::atf_run::get_current_dir; - - ::mkdir("files", 0755); - ::mkdir("files/dir", 0755); - create_file("files/reg"); - - atf::fs::path curdir = get_current_dir(); - change_directory(atf::fs::path(".")); - ATF_REQUIRE(get_current_dir() == curdir); - change_directory(atf::fs::path("files")); - ATF_REQUIRE(get_current_dir() == curdir / "files"); - change_directory(atf::fs::path("dir")); - ATF_REQUIRE(get_current_dir() == curdir / "files/dir"); - change_directory(atf::fs::path("..")); - ATF_REQUIRE(get_current_dir() == curdir / "files"); - change_directory(atf::fs::path("..")); - ATF_REQUIRE(get_current_dir() == curdir); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the tests for the "temp_dir" class. - ATF_ADD_TEST_CASE(tcs, temp_dir_raii); - - // Add the tests for the free functions. - ATF_ADD_TEST_CASE(tcs, cleanup); - ATF_ADD_TEST_CASE(tcs, cleanup_eacces_on_root); - ATF_ADD_TEST_CASE(tcs, cleanup_eacces_on_subdir); - ATF_ADD_TEST_CASE(tcs, change_directory); - ATF_ADD_TEST_CASE(tcs, get_current_dir); -} diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp index 66f6c4c9ef99..b08c020e95d5 100644 --- a/atf-sh/atf-check.cpp +++ b/atf-sh/atf-check.cpp @@ -724,7 +724,7 @@ const char* atf_check::m_description = "atf-check executes given command and analyzes its results."; atf_check::atf_check(void) : - app(m_description, "atf-check(1)", "atf(7)"), + app(m_description, "atf-check(1)"), m_xflag(false) { } diff --git a/atf-sh/atf-sh.cpp b/atf-sh/atf-sh.cpp index d7bc7fc82bc0..e985e79ab96f 100644 --- a/atf-sh/atf-sh.cpp +++ b/atf-sh/atf-sh.cpp @@ -122,7 +122,7 @@ const char* atf_sh::m_description = "system sh(1) with the atf-sh library."; atf_sh::atf_sh(void) : - app(m_description, "atf-sh(1)", "atf(7)") + app(m_description, "atf-sh(1)") { } diff --git a/atf-sh/integration_test.sh b/atf-sh/integration_test.sh index 55bb2784edf2..452c958ccc36 100644 --- a/atf-sh/integration_test.sh +++ b/atf-sh/integration_test.sh @@ -38,7 +38,7 @@ no_args_body() { cat >experr < header file. */ #undef HAVE_STDINT_H @@ -60,15 +51,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `unmount' function. */ -#undef HAVE_UNMOUNT - /* Define to 1 if you have the `unsetenv' function. */ #undef HAVE_UNSETENV -/* 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 diff --git a/bootstrap/Makefile.am.inc b/bootstrap/Makefile.am.inc index a590999f966c..83033946828d 100644 --- a/bootstrap/Makefile.am.inc +++ b/bootstrap/Makefile.am.inc @@ -29,11 +29,11 @@ check_PROGRAMS = bootstrap/h_app_empty bootstrap_h_app_empty_SOURCES = bootstrap/h_app_empty.cpp -bootstrap_h_app_empty_LDADD = $(ATF_CXX_LIBS) +bootstrap_h_app_empty_LDADD = tools/libtools.a $(ATF_CXX_LIBS) check_PROGRAMS += bootstrap/h_app_opts_args bootstrap_h_app_opts_args_SOURCES = bootstrap/h_app_opts_args.cpp -bootstrap_h_app_opts_args_LDADD = $(ATF_CXX_LIBS) +bootstrap_h_app_opts_args_LDADD = tools/libtools.a $(ATF_CXX_LIBS) check_PROGRAMS += bootstrap/h_tp_basic_c bootstrap_h_tp_basic_c_SOURCES = bootstrap/h_tp_basic_c.c diff --git a/bootstrap/h_app_empty.cpp b/bootstrap/h_app_empty.cpp index df8c1fb27623..9656f00135b8 100644 --- a/bootstrap/h_app_empty.cpp +++ b/bootstrap/h_app_empty.cpp @@ -29,9 +29,9 @@ #include -#include "atf-c++/detail/application.hpp" +#include "tools/application.hpp" -class h_app_empty : public atf::application::app { +class h_app_empty : public tools::application::app { static const char* m_description; public: diff --git a/bootstrap/h_app_opts_args.cpp b/bootstrap/h_app_opts_args.cpp index 26d6be841e24..f05a6b2bb130 100644 --- a/bootstrap/h_app_opts_args.cpp +++ b/bootstrap/h_app_opts_args.cpp @@ -30,10 +30,9 @@ #include #include -#include "atf-c++/detail/application.hpp" -#include "atf-c++/detail/sanity.hpp" +#include "tools/application.hpp" -class h_app_opts_args : public atf::application::app { +class h_app_opts_args : public tools::application::app { static const char* m_description; std::string specific_args(void) const; @@ -66,7 +65,7 @@ h_app_opts_args::options_set h_app_opts_args::specific_options(void) const { - using atf::application::option; + using tools::application::option; options_set opts; opts.insert(option('d', "", "Debug mode")); opts.insert(option('v', "level", "Verbosity level")); @@ -86,7 +85,7 @@ h_app_opts_args::process_option(int ch, const char* arg) break; default: - UNREACHABLE; + std::abort(); } } diff --git a/bootstrap/package.m4 b/bootstrap/package.m4 index 8c46fd8e4c36..c18cb4f0d407 100644 --- a/bootstrap/package.m4 +++ b/bootstrap/package.m4 @@ -1,7 +1,7 @@ # Signature of the current package. m4_define(AT_PACKAGE_NAME, Automated Testing Framework) m4_define(AT_PACKAGE_TARNAME, atf) -m4_define(AT_PACKAGE_VERSION, 0.18) -m4_define(AT_PACKAGE_STRING, Automated Testing Framework 0.18) +m4_define(AT_PACKAGE_VERSION, 0.19) +m4_define(AT_PACKAGE_STRING, Automated Testing Framework 0.19) m4_define(AT_PACKAGE_BUGREPORT, atf-devel@NetBSD.org) m4_define(ENABLE_TOOLS, yes) diff --git a/bootstrap/testsuite b/bootstrap/testsuite index ec9c156acb08..7ec66f2051be 100755 --- a/bootstrap/testsuite +++ b/bootstrap/testsuite @@ -584,7 +584,8 @@ at_change_dir=false # Whether to enable colored test results. at_color=no # List of the tested programs. -at_tested='' +at_tested='atf-config +atf-run' # As many question marks as there are digits in the last test group number. # Used to normalize the test group numbers so that `ls' lists them in # numerical order. @@ -595,6 +596,10 @@ at_help_all="1;t_test_program_filter.at:30;test_program: filter test cases by na 3;t_test_program_list.at:30;test_program: list test cases;; 4;t_test_program_compare.at:30;test_program: compare the user-visible interfaces;; 5;t_subr_atf_check.at:30;subr: atf_check function;; +6;t_application_opts_args.at:30;application: arguments and options handling;; +7;t_application_help.at:30;application: online help option;; +8;t_atf_config.at:30;atf-config: querying of build-time variables;; +9;t_atf_run.at:30;atf-run: execution of tests;; " # List of the all the test groups. at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'` @@ -608,7 +613,7 @@ at_fn_validate_ranges () for at_grp do eval at_value=\$$at_grp - if test $at_value -lt 1 || test $at_value -gt 5; then + if test $at_value -lt 1 || test $at_value -gt 9; then $as_echo "invalid test group: $at_value" >&2 exit 1 fi @@ -906,7 +911,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -Automated Testing Framework 0.18 test suite: bootstrap tests test groups: +Automated Testing Framework 0.19 test suite: bootstrap tests test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -947,7 +952,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (Automated Testing Framework 0.18)" && + $as_echo "$as_me (Automated Testing Framework 0.19)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1124,11 +1129,11 @@ exec 5>>"$at_suite_log" # Banners and logs. $as_echo "## ------------------------------------------------------------- ## -## Automated Testing Framework 0.18 test suite: bootstrap tests. ## +## Automated Testing Framework 0.19 test suite: bootstrap tests. ## ## ------------------------------------------------------------- ##" { $as_echo "## ------------------------------------------------------------- ## -## Automated Testing Framework 0.18 test suite: bootstrap tests. ## +## Automated Testing Framework 0.19 test suite: bootstrap tests. ## ## ------------------------------------------------------------- ##" echo @@ -1972,7 +1977,7 @@ _ASBOX $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [Automated Testing Framework 0.18] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [Automated Testing Framework 0.19] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may @@ -5871,3 +5876,2471 @@ $at_traceon; } ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" #AT_STOP_5 +#AT_START_6 +at_fn_group_banner 6 't_application_opts_args.at:30' \ + "application: arguments and options handling" " " +at_xfail=no +( + $as_echo "6. $at_setup_line: testing $at_desc ..." + $at_traceon + + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:34: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_empty -h" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:34" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_empty -h +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:34" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:35: grep ' -d ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:35" +( $at_check_trace; grep ' -d ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:35" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:36: grep ' -h ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:36" +( $at_check_trace; grep ' -h ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:36" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:37: grep ' -v ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:37" +( $at_check_trace; grep ' -v ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:37" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:38: grep ' -z ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:38" +( $at_check_trace; grep ' -z ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:38" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:42: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_opts_args -h" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:42" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_opts_args -h +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:42" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:43: grep ' -d ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:43" +( $at_check_trace; grep ' -d ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:43" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:44: grep ' -h ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:44" +( $at_check_trace; grep ' -h ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:44" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:45: grep ' -v ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:45" +( $at_check_trace; grep ' -v ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:45" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:46: grep ' -z ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:46" +( $at_check_trace; grep ' -z ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:46" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:50: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_empty -d" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:50" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_empty -d +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:50" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:51: grep 'Unknown option.*-d' stderr" +at_fn_check_prepare_trace "t_application_opts_args.at:51" +( $at_check_trace; grep 'Unknown option.*-d' stderr +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:51" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:52: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_empty -v" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:52" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_empty -v +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:52" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:53: grep 'Unknown option.*-v' stderr" +at_fn_check_prepare_trace "t_application_opts_args.at:53" +( $at_check_trace; grep 'Unknown option.*-v' stderr +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:53" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:54: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_empty -z" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:54" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_empty -z +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:54" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:55: grep 'Unknown option.*-z' stderr" +at_fn_check_prepare_trace "t_application_opts_args.at:55" +( $at_check_trace; grep 'Unknown option.*-z' stderr +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:55" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:59: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_opts_args -d" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:59" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_opts_args -d +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:59" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:60: grep -- '-d given' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:60" +( $at_check_trace; grep -- '-d given' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:60" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:61: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_opts_args -v" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:61" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_opts_args -v +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:61" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:62: grep 'Option.*-v.*requires an argument' stderr" +at_fn_check_prepare_trace "t_application_opts_args.at:62" +( $at_check_trace; grep 'Option.*-v.*requires an argument' stderr +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:62" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:63: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_opts_args -v foo" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:63" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_opts_args -v foo +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:63" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:64: grep -- '-v given with argument foo' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:64" +( $at_check_trace; grep -- '-v given with argument foo' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:64" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:65: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_opts_args -z" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:65" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_opts_args -z +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:65" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:66: grep 'Unknown option.*-z' stderr" +at_fn_check_prepare_trace "t_application_opts_args.at:66" +( $at_check_trace; grep 'Unknown option.*-z' stderr +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:66" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:69: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_opts_args -- -d" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:69" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_opts_args -- -d +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:69" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:70: grep -- '-d given' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:70" +( $at_check_trace; grep -- '-d given' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:70" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:71: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_opts_args arg -d" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:71" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_opts_args arg -d +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:71" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:72: grep -- '-d given' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:72" +( $at_check_trace; grep -- '-d given' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:72" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:76: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_empty -h" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:76" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_empty -h +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:76" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:77: grep '\\[options\\]\$' stdout" +at_fn_check_prepare_dynamic "grep '\\[options\\]$' stdout" "t_application_opts_args.at:77" +( $at_check_trace; grep '\[options\]$' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:77" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:81: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_opts_args -h" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:81" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_opts_args -h +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:81" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_opts_args.at:82: grep '\\[options\\] ' stdout" +at_fn_check_prepare_trace "t_application_opts_args.at:82" +( $at_check_trace; grep '\[options\] ' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:82" +$at_failed && at_fn_log_failure +$at_traceon; } + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_6 +#AT_START_7 +at_fn_group_banner 7 't_application_help.at:30' \ + "application: online help option" " " +at_xfail=no +( + $as_echo "7. $at_setup_line: testing $at_desc ..." + $at_traceon + + +{ set +x +$as_echo "$at_srcdir/t_application_help.at:32: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_empty" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_help.at:32" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_empty +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_help.at:32" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_help.at:33: grep 'Available options' stdout" +at_fn_check_prepare_trace "t_application_help.at:33" +( $at_check_trace; grep 'Available options' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_application_help.at:33" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_application_help.at:35: \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_app_empty -h" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_help.at:35" +( $at_check_trace; $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_app_empty -h +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_help.at:35" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_application_help.at:36: grep 'Available options' stdout" +at_fn_check_prepare_trace "t_application_help.at:36" +( $at_check_trace; grep 'Available options' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_application_help.at:36" +$at_failed && at_fn_log_failure +$at_traceon; } + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_7 +#AT_START_8 +at_fn_group_banner 8 't_atf_config.at:30' \ + "atf-config: querying of build-time variables" " " +at_xfail=no +( + $as_echo "8. $at_setup_line: testing $at_desc ..." + $at_traceon + + + +all_vars="atf_arch \ + atf_build_cc \ + atf_build_cflags \ + atf_build_cpp \ + atf_build_cppflags \ + atf_build_cxx \ + atf_build_cxxflags \ + atf_confdir \ + atf_includedir \ + atf_libdir \ + atf_libexecdir \ + atf_machine \ + atf_pkgdatadir \ + atf_shell \ + atf_workdir" +all_vars_no=15 + +{ set +x +$as_echo "$at_srcdir/t_atf_config.at:51: atf-config" +at_fn_check_prepare_trace "t_atf_config.at:51" +( $at_check_trace; atf-config +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:51" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_config.at:52: test $(wc -l stdout | awk '{ print $1 }') = \${all_vars_no}" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:52" +( $at_check_trace; test $(wc -l stdout | awk '{ print $1 }') = ${all_vars_no} +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:52" +$at_failed && at_fn_log_failure +$at_traceon; } + +for v in ${all_vars}; do + { set +x +$as_echo "$at_srcdir/t_atf_config.at:54: grep \"\${v}\" stdout" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:54" +( $at_check_trace; grep "${v}" stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:54" +$at_failed && at_fn_log_failure +$at_traceon; } + +done + +for v in ${all_vars}; do + { set +x +$as_echo "$at_srcdir/t_atf_config.at:59: atf-config \${v}" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:59" +( $at_check_trace; atf-config ${v} +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:59" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:60: test $(wc -l stdout | awk '{ print $1 }') = 1" +at_fn_check_prepare_notrace 'a shell pipeline' "t_atf_config.at:60" +( $at_check_trace; test $(wc -l stdout | awk '{ print $1 }') = 1 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:60" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:61: grep \"\${v}\" stdout" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:61" +( $at_check_trace; grep "${v}" stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:61" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:62: cut -d ' ' -f 3- stdout" +at_fn_check_prepare_trace "t_atf_config.at:62" +( $at_check_trace; cut -d ' ' -f 3- stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:62" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:63: mv stdout expout" +at_fn_check_prepare_trace "t_atf_config.at:63" +( $at_check_trace; mv stdout expout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:63" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:64: atf-config -t \${v}" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:64" +( $at_check_trace; atf-config -t ${v} +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +$at_diff expout "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:64" +$at_failed && at_fn_log_failure +$at_traceon; } + +done + +{ set +x +$as_echo "$at_srcdir/t_atf_config.at:68: atf-config atf_libexecdir atf_pkgdatadir" +at_fn_check_prepare_trace "t_atf_config.at:68" +( $at_check_trace; atf-config atf_libexecdir atf_pkgdatadir +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:68" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_config.at:69: grep 'atf_libexecdir' stdout" +at_fn_check_prepare_trace "t_atf_config.at:69" +( $at_check_trace; grep 'atf_libexecdir' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:69" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_config.at:70: grep 'atf_pkgdatadir' stdout" +at_fn_check_prepare_trace "t_atf_config.at:70" +( $at_check_trace; grep 'atf_pkgdatadir' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:70" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_config.at:71: test $(wc -l stdout | awk '{ print $1 }') = 2" +at_fn_check_prepare_notrace 'a shell pipeline' "t_atf_config.at:71" +( $at_check_trace; test $(wc -l stdout | awk '{ print $1 }') = 2 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:71" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_config.at:74: atf-config non_existent" +at_fn_check_prepare_trace "t_atf_config.at:74" +( $at_check_trace; atf-config non_existent +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_config.at:74" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_config.at:75: grep 'Unknown variable.*non_existent' stderr" +at_fn_check_prepare_trace "t_atf_config.at:75" +( $at_check_trace; grep 'Unknown variable.*non_existent' stderr +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:75" +$at_failed && at_fn_log_failure +$at_traceon; } + + +for v in ${all_vars}; do + { set +x +$as_echo "$at_srcdir/t_atf_config.at:79: atf-config \${v} non_existent" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:79" +( $at_check_trace; atf-config ${v} non_existent +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_config.at:79" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:80: grep 'Unknown variable.*non_existent' stderr" +at_fn_check_prepare_trace "t_atf_config.at:80" +( $at_check_trace; grep 'Unknown variable.*non_existent' stderr +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:80" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:82: atf-config non_existent \${v}" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:82" +( $at_check_trace; atf-config non_existent ${v} +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_config.at:82" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:83: grep 'Unknown variable.*non_existent' stderr" +at_fn_check_prepare_trace "t_atf_config.at:83" +( $at_check_trace; grep 'Unknown variable.*non_existent' stderr +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:83" +$at_failed && at_fn_log_failure +$at_traceon; } + +done + +for v in ${all_vars}; do + V=$(echo ${v} | tr '[a-z]' '[A-Z]') + { set +x +$as_echo "$at_srcdir/t_atf_config.at:90: env \${V}=testval atf-config" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:90" +( $at_check_trace; env ${V}=testval atf-config +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:90" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:91: mv stdout all" +at_fn_check_prepare_trace "t_atf_config.at:91" +( $at_check_trace; mv stdout all +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:91" +$at_failed && at_fn_log_failure +$at_traceon; } + + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:93: grep \"^\${v} : \" all" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:93" +( $at_check_trace; grep "^${v} : " all +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:93" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:94: mv stdout affected" +at_fn_check_prepare_trace "t_atf_config.at:94" +( $at_check_trace; mv stdout affected +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:94" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:95: grep -v \"^\${v} : \" all" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:95" +( $at_check_trace; grep -v "^${v} : " all +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:95" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:96: mv stdout unaffected" +at_fn_check_prepare_trace "t_atf_config.at:96" +( $at_check_trace; mv stdout unaffected +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:96" +$at_failed && at_fn_log_failure +$at_traceon; } + + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:98: test $(wc -l affected | awk '{ print $1 }') = 1" +at_fn_check_prepare_notrace 'a shell pipeline' "t_atf_config.at:98" +( $at_check_trace; test $(wc -l affected | awk '{ print $1 }') = 1 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:98" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:99: test $(wc -l unaffected | awk '{ print $1 }') = \$((\${all_vars_no} - 1))" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_config.at:99" +( $at_check_trace; test $(wc -l unaffected | awk '{ print $1 }') = $((${all_vars_no} - 1)) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:99" +$at_failed && at_fn_log_failure +$at_traceon; } + + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:102: grep \"^\${v} : testval\$\" affected" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:102" +( $at_check_trace; grep "^${v} : testval$" affected +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:102" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/t_atf_config.at:103: grep ' : testval\$' unaffected" +at_fn_check_prepare_dynamic "grep ' : testval$' unaffected" "t_atf_config.at:103" +( $at_check_trace; grep ' : testval$' unaffected +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_config.at:103" +$at_failed && at_fn_log_failure +$at_traceon; } + +done + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_8 +#AT_START_9 +at_fn_group_banner 9 't_atf_run.at:30' \ + "atf-run: execution of tests" " " +at_xfail=no +( + $as_echo "9. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:47: mkdir top" +at_fn_check_prepare_trace "t_atf_run.at:47" +( $at_check_trace; mkdir top +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:47" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:48: mkdir top/dir1" +at_fn_check_prepare_trace "t_atf_run.at:48" +( $at_check_trace; mkdir top/dir1 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:48" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:49: mkdir top/dir2" +at_fn_check_prepare_trace "t_atf_run.at:49" +( $at_check_trace; mkdir top/dir2 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:49" +$at_failed && at_fn_log_failure +$at_traceon; } + +cat >top/Atffile <<'_ATEOF' +Content-Type: application/X-atf-atffile; version="1" + +prop: test-suite = atf + +tp: dir1 +tp: dir2 +tp: test1 +tp: test2 +_ATEOF + +cat >top/dir1/Atffile <<'_ATEOF' +Content-Type: application/X-atf-atffile; version="1" + +prop: test-suite = atf + +tp: test3 +_ATEOF + +cat >top/dir2/Atffile <<'_ATEOF' +Content-Type: application/X-atf-atffile; version="1" + +prop: test-suite = atf + +tp: test4 +tp: test5 +_ATEOF + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:75: sed -e 's,@TC_NAME@,tc_1,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_pass" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:75" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_1,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_pass +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:75" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:75: mv stdout top/test1" +at_fn_check_prepare_trace "t_atf_run.at:75" +( $at_check_trace; mv stdout top/test1 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:75" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:75: chmod +x top/test1" +at_fn_check_prepare_trace "t_atf_run.at:75" +( $at_check_trace; chmod +x top/test1 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:75" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:76: sed -e 's,@TC_NAME@,tc_2,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_fail" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:76" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_2,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_fail +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:76" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:76: mv stdout top/test2" +at_fn_check_prepare_trace "t_atf_run.at:76" +( $at_check_trace; mv stdout top/test2 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:76" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:76: chmod +x top/test2" +at_fn_check_prepare_trace "t_atf_run.at:76" +( $at_check_trace; chmod +x top/test2 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:76" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:77: sed -e 's,@TC_NAME@,tc_3,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_pass" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:77" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_3,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_pass +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:77" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:77: mv stdout top/dir1/test3" +at_fn_check_prepare_trace "t_atf_run.at:77" +( $at_check_trace; mv stdout top/dir1/test3 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:77" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:77: chmod +x top/dir1/test3" +at_fn_check_prepare_trace "t_atf_run.at:77" +( $at_check_trace; chmod +x top/dir1/test3 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:77" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:78: sed -e 's,@TC_NAME@,tc_4,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_fail" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:78" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_4,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_fail +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:78" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:78: mv stdout top/dir2/test4" +at_fn_check_prepare_trace "t_atf_run.at:78" +( $at_check_trace; mv stdout top/dir2/test4 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:78" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:78: chmod +x top/dir2/test4" +at_fn_check_prepare_trace "t_atf_run.at:78" +( $at_check_trace; chmod +x top/dir2/test4 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:78" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:79: sed -e 's,@TC_NAME@,tc_5,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_pass" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:79" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_5,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_pass +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:79" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:79: mv stdout top/dir2/test5" +at_fn_check_prepare_trace "t_atf_run.at:79" +( $at_check_trace; mv stdout top/dir2/test5 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:79" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:79: chmod +x top/dir2/test5" +at_fn_check_prepare_trace "t_atf_run.at:79" +( $at_check_trace; chmod +x top/dir2/test5 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:79" +$at_failed && at_fn_log_failure +$at_traceon; } + + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:81: cd top/dir1 && atf-run" +at_fn_check_prepare_trace "t_atf_run.at:81" +( $at_check_trace; cd top/dir1 && atf-run +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:81" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:82: grep '^tc-end: [0-9. ]*, tc_3, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:82" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_3, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:82" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:83: grep -i 'tc_[1245]' stdout" +at_fn_check_prepare_trace "t_atf_run.at:83" +( $at_check_trace; grep -i 'tc_[1245]' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:83" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:84: grep 'tc-so:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:84" +( $at_check_trace; grep 'tc-so:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:84" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:85: grep 'tc-se:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:85" +( $at_check_trace; grep 'tc-se:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:85" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:87: cd top/dir2 && atf-run" +at_fn_check_prepare_trace "t_atf_run.at:87" +( $at_check_trace; cd top/dir2 && atf-run +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:87" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:88: grep '^tc-end: [0-9. ]*, tc_4, failed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:88" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_4, failed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:88" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:89: grep '^tc-end: [0-9. ]*, tc_5, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:89" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_5, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:89" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:90: grep -i 'tc_[123]' stdout" +at_fn_check_prepare_trace "t_atf_run.at:90" +( $at_check_trace; grep -i 'tc_[123]' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:90" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:91: grep 'tc-so:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:91" +( $at_check_trace; grep 'tc-so:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:91" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:92: grep 'tc-se:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:92" +( $at_check_trace; grep 'tc-se:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:92" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:94: cd top && atf-run" +at_fn_check_prepare_trace "t_atf_run.at:94" +( $at_check_trace; cd top && atf-run +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:94" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:95: grep '^tc-end: [0-9. ]*, tc_1, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:95" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_1, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:95" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:96: grep '^tc-end: [0-9. ]*, tc_2, failed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:96" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_2, failed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:96" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:97: grep '^tc-end: [0-9. ]*, tc_3, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:97" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_3, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:97" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:98: grep '^tc-end: [0-9. ]*, tc_4, failed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:98" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_4, failed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:98" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:99: grep '^tc-end: [0-9. ]*, tc_5, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:99" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_5, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:99" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:100: grep 'tc-so:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:100" +( $at_check_trace; grep 'tc-so:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:100" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:101: grep 'tc-se:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:101" +( $at_check_trace; grep 'tc-se:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:101" +$at_failed && at_fn_log_failure +$at_traceon; } + + +cat >top/Atffile <<'_ATEOF' +Content-Type: application/X-atf-atffile; version="1" + +prop: test-suite = atf + +tp-glob: * +_ATEOF + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:111: cd top && atf-run" +at_fn_check_prepare_trace "t_atf_run.at:111" +( $at_check_trace; cd top && atf-run +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:111" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:112: grep '^tc-end: [0-9. ]*, tc_1, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:112" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_1, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:112" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:113: grep '^tc-end: [0-9. ]*, tc_2, failed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:113" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_2, failed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:113" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:114: grep '^tc-end: [0-9. ]*, tc_3, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:114" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_3, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:114" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:115: grep '^tc-end: [0-9. ]*, tc_4, failed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:115" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_4, failed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:115" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:116: grep '^tc-end: [0-9. ]*, tc_5, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:116" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_5, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:116" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:117: grep 'tc-so:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:117" +( $at_check_trace; grep 'tc-so:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:117" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:118: grep 'tc-se:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:118" +( $at_check_trace; grep 'tc-se:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:118" +$at_failed && at_fn_log_failure +$at_traceon; } + + +cat >top/Atffile <<'_ATEOF' +Content-Type: application/X-atf-atffile; version="1" + +prop: test-suite = atf + +tp-glob: d* +_ATEOF + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:128: cd top && atf-run" +at_fn_check_prepare_trace "t_atf_run.at:128" +( $at_check_trace; cd top && atf-run +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:128" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:129: grep '^tc-end: [0-9. ]*, tc_3, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:129" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_3, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:129" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:130: grep '^tc-end: [0-9. ]*, tc_4, failed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:130" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_4, failed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:130" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:131: grep '^tc-end: [0-9. ]*, tc_5, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:131" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_5, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:131" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:132: grep 'tc-so:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:132" +( $at_check_trace; grep 'tc-so:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:132" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:133: grep 'tc-se:ignore-me' stdout" +at_fn_check_prepare_trace "t_atf_run.at:133" +( $at_check_trace; grep 'tc-se:ignore-me' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:133" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:138: rm -rf top" +at_fn_check_prepare_trace "t_atf_run.at:138" +( $at_check_trace; rm -rf top +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:138" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:139: mkdir top" +at_fn_check_prepare_trace "t_atf_run.at:139" +( $at_check_trace; mkdir top +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:139" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:140: sed -e 's,@TC_NAME@,tc_1,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_pass" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:140" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_1,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_pass +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:140" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:140: mv stdout top/test1" +at_fn_check_prepare_trace "t_atf_run.at:140" +( $at_check_trace; mv stdout top/test1 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:140" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:140: chmod +x top/test1" +at_fn_check_prepare_trace "t_atf_run.at:140" +( $at_check_trace; chmod +x top/test1 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:140" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:141: sed -e 's,@TC_NAME@,tc_2,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_pass" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:141" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_2,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_pass +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:141" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:141: mv stdout top/test2" +at_fn_check_prepare_trace "t_atf_run.at:141" +( $at_check_trace; mv stdout top/test2 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:141" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:141: chmod +x top/test2" +at_fn_check_prepare_trace "t_atf_run.at:141" +( $at_check_trace; chmod +x top/test2 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:141" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:142: sed -e 's,@TC_NAME@,tc_3,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_pass" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:142" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_3,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_pass +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:142" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:142: mv stdout top/test3" +at_fn_check_prepare_trace "t_atf_run.at:142" +( $at_check_trace; mv stdout top/test3 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:142" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:142: chmod +x top/test3" +at_fn_check_prepare_trace "t_atf_run.at:142" +( $at_check_trace; chmod +x top/test3 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:142" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:143: chmod -x top/test3" +at_fn_check_prepare_trace "t_atf_run.at:143" +( $at_check_trace; chmod -x top/test3 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:143" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:144: sed -e 's,@TC_NAME@,tc_4,g' <\$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_pass" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:144" +( $at_check_trace; sed -e 's,@TC_NAME@,tc_4,g' <$({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_pass +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:144" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:144: mv stdout top/.test4" +at_fn_check_prepare_trace "t_atf_run.at:144" +( $at_check_trace; mv stdout top/.test4 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:144" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:144: chmod +x top/.test4" +at_fn_check_prepare_trace "t_atf_run.at:144" +( $at_check_trace; chmod +x top/.test4 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:144" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:145: chmod -x top/.test4" +at_fn_check_prepare_trace "t_atf_run.at:145" +( $at_check_trace; chmod -x top/.test4 +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:145" +$at_failed && at_fn_log_failure +$at_traceon; } + +cat >top/Atffile <<'_ATEOF' +Content-Type: application/X-atf-atffile; version="1" + +prop: test-suite = atf + +tp-glob: * +_ATEOF + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:153: cd top && atf-run" +at_fn_check_prepare_trace "t_atf_run.at:153" +( $at_check_trace; cd top && atf-run +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:153" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:154: grep '^tc-end: [0-9. ]*, tc_1, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:154" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_1, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:154" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:155: grep '^tc-end: [0-9. ]*, tc_2, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:155" +( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_2, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:155" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:156: grep -i 'tc_3' stdout" +at_fn_check_prepare_trace "t_atf_run.at:156" +( $at_check_trace; grep -i 'tc_3' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:156" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:157: grep -i 'tc_4' stdout" +at_fn_check_prepare_trace "t_atf_run.at:157" +( $at_check_trace; grep -i 'tc_4' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:157" +$at_failed && at_fn_log_failure +$at_traceon; } + + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:160: rm -rf top" +at_fn_check_prepare_trace "t_atf_run.at:160" +( $at_check_trace; rm -rf top +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:160" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:161: mkdir top" +at_fn_check_prepare_trace "t_atf_run.at:161" +( $at_check_trace; mkdir top +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:161" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:162: cp \$({ + old=\$(pwd) + while test \$(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=\$(pwd) + cd \${old} + echo \${topdir} +})/bootstrap/h_tp_basic_sh top" +at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:162" +( $at_check_trace; cp $({ + old=$(pwd) + while test $(pwd) != '/' -a ! -e ./Makefile; do + cd .. + done + topdir=$(pwd) + cd ${old} + echo ${topdir} +})/bootstrap/h_tp_basic_sh top +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:162" +$at_failed && at_fn_log_failure +$at_traceon; } + +cat >top/Atffile <<'_ATEOF' +Content-Type: application/X-atf-atffile; version="1" + +prop: test-suite = atf + +tp: h_tp_basic_sh +_ATEOF + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:170: cd top && atf-run" +at_fn_check_prepare_trace "t_atf_run.at:170" +( $at_check_trace; cd top && atf-run +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; tee stdout <"$at_stdout" +at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:170" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:171: grep '^tc-end: [0-9. ]*, pass, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:171" +( $at_check_trace; grep '^tc-end: [0-9. ]*, pass, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:171" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:172: grep '^tc-end: [0-9. ]*, fail, failed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:172" +( $at_check_trace; grep '^tc-end: [0-9. ]*, fail, failed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:172" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:173: grep '^tc-end: [0-9. ]*, skip, skipped' stdout" +at_fn_check_prepare_trace "t_atf_run.at:173" +( $at_check_trace; grep '^tc-end: [0-9. ]*, skip, skipped' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:173" +$at_failed && at_fn_log_failure +$at_traceon; } + +{ set +x +$as_echo "$at_srcdir/t_atf_run.at:174: grep '^tc-end: [0-9. ]*, default, passed' stdout" +at_fn_check_prepare_trace "t_atf_run.at:174" +( $at_check_trace; grep '^tc-end: [0-9. ]*, default, passed' stdout +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo stdout:; cat "$at_stdout" +at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:174" +$at_failed && at_fn_log_failure +$at_traceon; } + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_9 diff --git a/bootstrap/testsuite.at b/bootstrap/testsuite.at index d6db49ae6a68..3536ac95b84d 100644 --- a/bootstrap/testsuite.at +++ b/bootstrap/testsuite.at @@ -74,7 +74,7 @@ m4_include(bootstrap/t_test_program_list.at) m4_include(bootstrap/t_test_program_compare.at) m4_include(bootstrap/t_subr_atf_check.at) -m4_if([ENABLE_TOOLS], yes, [ +m4_if(ENABLE_TOOLS, yes, [ m4_include(bootstrap/t_application_opts_args.at) m4_include(bootstrap/t_application_help.at) m4_include(bootstrap/t_atf_config.at) diff --git a/configure b/configure index f4c6121b861f..50333919d7ac 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Automated Testing Framework 0.18. +# Generated by GNU Autoconf 2.69 for Automated Testing Framework 0.19. # # Report bugs to . # @@ -592,10 +592,10 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Automated Testing Framework' PACKAGE_TARNAME='atf' -PACKAGE_VERSION='0.18' -PACKAGE_STRING='Automated Testing Framework 0.18' +PACKAGE_VERSION='0.19' +PACKAGE_STRING='Automated Testing Framework 0.19' PACKAGE_BUGREPORT='atf-devel@NetBSD.org' -PACKAGE_URL='http://code.google.com/p/kyua/wiki/ATF' +PACKAGE_URL='https://github.com/jmmv/atf/' ac_unique_file="atf-c.h" # Factoring default headers for most tests. @@ -683,8 +683,6 @@ NMEDIT DSYMUTIL MANIFEST_TOOL RANLIB -ac_ct_AR -AR DLLTOOL OBJDUMP LN_S @@ -696,6 +694,7 @@ FGREP EGREP GREP SED +LIBTOOL am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -713,7 +712,8 @@ CPPFLAGS LDFLAGS CFLAGS CC -LIBTOOL +ac_ct_AR +AR AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V @@ -795,11 +795,11 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_silent_rules +enable_dependency_tracking enable_shared enable_static with_pic enable_fast_install -enable_dependency_tracking with_gnu_ld with_sysroot enable_libtool_lock @@ -1368,7 +1368,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Automated Testing Framework 0.18 to adapt to many kinds of systems. +\`configure' configures Automated Testing Framework 0.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1439,7 +1439,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Automated Testing Framework 0.18:";; + short | recursive ) echo "Configuration of Automated Testing Framework 0.19:";; esac cat <<\_ACEOF @@ -1449,14 +1449,14 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-silent-rules less verbose build output (undo: "make V=1") --disable-silent-rules verbose build output (undo: "make V=0") - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-tools Enables the build of the deprecated ATF tools --enable-developer enable developer features @@ -1503,7 +1503,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . -Automated Testing Framework home page: . +Automated Testing Framework home page: . _ACEOF ac_status=$? fi @@ -1566,7 +1566,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Automated Testing Framework configure 0.18 +Automated Testing Framework configure 0.19 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2130,7 +2130,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Automated Testing Framework $as_me 0.18, which was +It was created by Automated Testing Framework $as_me 0.19, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3116,7 +3116,7 @@ fi # Define the identity of the package. PACKAGE='atf' - VERSION='0.18' + VERSION='0.19' cat >>confdefs.h <<_ACEOF @@ -3209,100 +3209,6 @@ END fi fi -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.4.2' -macro_revision='1.3337' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4342,6 +4248,272 @@ else fi + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar lib "link -lib" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar lib "link -lib" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 +$as_echo_n "checking the archiver ($AR) interface... " >&6; } +if ${am_cv_ar_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int some_variable = 0; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 +$as_echo "$am_cv_ar_interface" >&6; } + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + as_fn_error $? "could not determine $AR interface" "$LINENO" 5 + ;; +esac + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.2' +macro_revision='1.3337' + + + + + + + + + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if ${ac_cv_path_SED+:} false; then : @@ -5767,7 +5939,6 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - if test -n "$ac_tool_prefix"; then for ac_prog in ar do @@ -16787,97 +16958,6 @@ done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether putenv is in std" >&5 -$as_echo_n "checking whether putenv is in std... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -std::putenv("a=b"); - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_PUTENV_IN_STD 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setenv is in std" >&5 -$as_echo_n "checking whether setenv is in std... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -std::setenv("a", "b"); - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_SETENV_IN_STD 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether unsetenv is in std" >&5 -$as_echo_n "checking whether unsetenv is in std... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -std::unsetenv("a"); - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_UNSETENV_IN_STD 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether basename takes a constant pointer" >&5 $as_echo_n "checking whether basename takes a constant pointer... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16980,51 +17060,6 @@ $as_echo "#define HAVE_GETCWD_DYN 1" >>confdefs.h fi - for ac_func in unmount -do : - ac_fn_cxx_check_func "$LINENO" "unmount" "ac_cv_func_unmount" -if test "x$ac_cv_func_unmount" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_UNMOUNT 1 -_ACEOF - -fi -done - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf is in std" >&5 -$as_echo_n "checking whether snprintf is in std... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -char buf; - std::snprintf(&buf, 1, ""); - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_SNPRINTF_IN_STD 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the last valid signal" >&5 $as_echo_n "checking for the last valid signal... " >&6; } @@ -17419,7 +17454,7 @@ fi -ac_config_files="$ac_config_files Makefile atf-c/defs.h" +ac_config_files="$ac_config_files Makefile atf-c/defs.h tools/defs.hpp" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -17967,7 +18002,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Automated Testing Framework $as_me 0.18, which was +This file was extended by Automated Testing Framework $as_me 0.19, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18028,13 +18063,13 @@ Configuration commands: $config_commands Report bugs to . -Automated Testing Framework home page: ." +Automated Testing Framework home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Automated Testing Framework config.status 0.18 +Automated Testing Framework config.status 0.19 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18545,6 +18580,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "atf-c/defs.h") CONFIG_FILES="$CONFIG_FILES atf-c/defs.h" ;; + "tools/defs.hpp") CONFIG_FILES="$CONFIG_FILES tools/defs.hpp" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index b6c8da0defd7..bca3184ab0e3 100644 --- a/configure.ac +++ b/configure.ac @@ -31,8 +31,8 @@ dnl ----------------------------------------------------------------------- dnl Initialize the GNU build system. dnl ----------------------------------------------------------------------- -AC_INIT([Automated Testing Framework], [0.18], [atf-devel@NetBSD.org], [atf], - [http://code.google.com/p/kyua/wiki/ATF]) +AC_INIT([Automated Testing Framework], [0.19], [atf-devel@NetBSD.org], [atf], + [https://github.com/jmmv/atf/]) AC_PREREQ([2.65]) AC_COPYRIGHT([Copyright (c) 2007-2012 The NetBSD Foundation, Inc.]) AC_DEFINE([PACKAGE_COPYRIGHT], @@ -48,6 +48,7 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.9 check-news foreign subdir-objects -Wall]) +AM_PROG_AR LT_INIT AC_ARG_ENABLE(tools, @@ -90,7 +91,6 @@ ATF_MODULE_APPLICATION ATF_MODULE_DEFS ATF_MODULE_ENV ATF_MODULE_FS -ATF_MODULE_SANITY ATF_MODULE_SIGNALS AC_CHECK_TYPE([timer_t], [], [], [[#include ]]) @@ -218,7 +218,7 @@ dnl ----------------------------------------------------------------------- dnl Finally, generate output. dnl ----------------------------------------------------------------------- -AC_OUTPUT([Makefile atf-c/defs.h]) +AC_OUTPUT([Makefile atf-c/defs.h tools/defs.hpp]) if test ${enable_tools} = yes; then AC_MSG_WARN([Building the deprecated ATF tools (atf-run and atf-report);]) diff --git a/doc/Makefile.am.inc b/doc/Makefile.am.inc index 858ff04715ed..432d96d6cdff 100644 --- a/doc/Makefile.am.inc +++ b/doc/Makefile.am.inc @@ -30,21 +30,4 @@ dist_man_MANS += doc/atf-test-case.4 \ doc/atf-test-program.1 -if ENABLE_TOOLS - -man_MANS += doc/atf.7 -CLEANFILES += doc/atf.7 -EXTRA_DIST += doc/atf.7.in - -dist_man_MANS += doc/atf-formats.5 - -doc/atf.7: $(srcdir)/doc/atf.7.in - test -d doc || mkdir -p doc - sed -e 's#__DOCDIR__#$(docdir)#g' \ - -e 's#__TESTSDIR__#$(testsdir)#g' \ - <$(srcdir)/doc/atf.7.in >doc/atf.7.tmp - mv doc/atf.7.tmp doc/atf.7 - -endif - # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/doc/atf-test-case.4 b/doc/atf-test-case.4 index e1b2bf45ca7f..c5e9e662a8e0 100644 --- a/doc/atf-test-case.4 +++ b/doc/atf-test-case.4 @@ -123,8 +123,9 @@ The usefulness of the .Sq expected_* results comes when writing test cases that verify known failures caused, in general, due to programming errors (aka bugs). -Whenever the faulty condition that the expectation is trying to convery is -fixed, then the test case will be reported as +Whenever the faulty condition that the +.Sq expected_* +result is trying to cover is fixed, then the test case will be reported as .Sq failed and the developer will have to adjust it to match its new condition. .Pp diff --git a/m4/cxx-std-funcs.m4 b/m4/cxx-std-funcs.m4 index d2266b4d5bc0..cd9a378f42b4 100644 --- a/m4/cxx-std-funcs.m4 +++ b/m4/cxx-std-funcs.m4 @@ -38,35 +38,6 @@ AC_DEFUN([ATF_CHECK_IN_STD], [ ) ]) -AC_DEFUN([ATF_CHECK_STD_PUTENV], [ - ATF_CHECK_IN_STD([putenv], - [#include ], - [std::putenv("a=b");] - ) -]) - -AC_DEFUN([ATF_CHECK_STD_SETENV], [ - ATF_CHECK_IN_STD([setenv], - [#include ], - [std::setenv("a", "b");] - ) -]) - -AC_DEFUN([ATF_CHECK_STD_SNPRINTF], [ - ATF_CHECK_IN_STD([snprintf], - [#include ], - [char buf; - std::snprintf(&buf, 1, "");] - ) -]) - -AC_DEFUN([ATF_CHECK_STD_UNSETENV], [ - ATF_CHECK_IN_STD([unsetenv], - [#include ], - [std::unsetenv("a");] - ) -]) - AC_DEFUN([ATF_CHECK_STD_VSNPRINTF], [ ATF_CHECK_IN_STD([vsnprintf], [#include diff --git a/m4/module-env.m4 b/m4/module-env.m4 index 8080e1c33e2c..6eb489f66c5d 100644 --- a/m4/module-env.m4 +++ b/m4/module-env.m4 @@ -29,8 +29,4 @@ dnl AC_DEFUN([ATF_MODULE_ENV], [ AC_CHECK_FUNCS([putenv setenv unsetenv]) - - ATF_CHECK_STD_PUTENV - ATF_CHECK_STD_SETENV - ATF_CHECK_STD_UNSETENV ]) diff --git a/m4/module-fs.m4 b/m4/module-fs.m4 index 7019a664a587..4b046090a626 100644 --- a/m4/module-fs.m4 +++ b/m4/module-fs.m4 @@ -66,6 +66,4 @@ AC_DEFUN([ATF_MODULE_FS], [ AC_DEFINE([HAVE_GETCWD_DYN], [1], [Define to 1 if getcwd(NULL, 0) works]) fi - - AC_CHECK_FUNCS([unmount]) ]) diff --git a/m4/module-sanity.m4 b/m4/module-sanity.m4 deleted file mode 100644 index 9d146c1c7f1b..000000000000 --- a/m4/module-sanity.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright (c) 2007 The NetBSD Foundation, Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions -dnl are met: -dnl 1. Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl 2. Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -AC_DEFUN([ATF_MODULE_SANITY], [ - ATF_CHECK_STD_SNPRINTF -]) diff --git a/tools/Atffile b/tools/Atffile new file mode 100644 index 000000000000..8896078bcf97 --- /dev/null +++ b/tools/Atffile @@ -0,0 +1,25 @@ +Content-Type: application/X-atf-atffile; version="1" + +prop: test-suite = atf + +tp: atf-config_test +tp: atf-report_test +tp: atf-run_test +tp: application_test +tp: atffile_test +tp: auto_array_test +tp: config_test +tp: config_file_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 diff --git a/tools/Kyuafile b/tools/Kyuafile new file mode 100644 index 000000000000..09c5145ff9eb --- /dev/null +++ b/tools/Kyuafile @@ -0,0 +1,24 @@ +syntax("kyuafile", 1) + +test_suite("atf") + +atf_test_program{name="atf-config_test"} +atf_test_program{name="atf-report_test"} +atf_test_program{name="atf-run_test"} +atf_test_program{name="application_test"} +atf_test_program{name="atffile_test"} +atf_test_program{name="auto_array_test"} +atf_test_program{name="config_test"} +atf_test_program{name="config_file_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"} diff --git a/tools/Makefile.am.inc b/tools/Makefile.am.inc new file mode 100644 index 000000000000..26668bae6516 --- /dev/null +++ b/tools/Makefile.am.inc @@ -0,0 +1,332 @@ +# +# Automated Testing Framework (atf) +# +# Copyright (c) 2007 The NetBSD Foundation, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +TOOLS_CPPFLAGS = -I$(top_srcdir)/tools -I$(top_builddir)/tools +TOOLS_LDADD = tools/libtools.a + +noinst_LIBRARIES = tools/libtools.a +tools_libtools_a_SOURCES = tools/application.cpp \ + tools/application.hpp \ + tools/atffile.cpp \ + tools/atffile.hpp \ + tools/auto_array.hpp \ + tools/config.cpp \ + tools/config.hpp \ + tools/config_file.cpp \ + tools/config_file.hpp \ + tools/env.cpp \ + tools/env.hpp \ + tools/exceptions.cpp \ + tools/exceptions.hpp \ + tools/expand.cpp \ + tools/expand.hpp \ + tools/fs.cpp \ + tools/fs.hpp \ + tools/io.cpp \ + tools/io.hpp \ + tools/parser.cpp \ + tools/parser.hpp \ + tools/process.cpp \ + tools/process.hpp \ + tools/reader.cpp \ + tools/reader.hpp \ + tools/requirements.cpp \ + tools/requirements.hpp \ + tools/signals.cpp \ + tools/signals.hpp \ + tools/test-program.cpp \ + tools/test-program.hpp \ + tools/test_helpers.hpp \ + tools/text.cpp \ + tools/text.hpp \ + tools/timers.cpp \ + tools/timers.hpp \ + tools/ui.cpp \ + tools/ui.hpp \ + tools/user.cpp \ + tools/user.hpp +nodist_tools_libtools_a_SOURCES = tools/defs.hpp +tools_libtools_a_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \ + "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ + "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \ + "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \ + "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \ + "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \ + "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \ + "-DATF_CONFDIR=\"$(atf_confdir)\"" \ + "-DATF_INCLUDEDIR=\"$(includedir)\"" \ + "-DATF_LIBDIR=\"$(libdir)\"" \ + "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \ + "-DATF_MACHINE=\"$(atf_machine)\"" \ + "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \ + "-DATF_SHELL=\"$(ATF_SHELL)\"" \ + "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \ + $(TOOLS_CPPFLAGS) + +# XXX For some reason, the nodist line above does not work as expected. +# Work this problem around. +DIST_HOOKS += kill-defs-hpp +kill-defs-hpp: + rm -f $(distdir)/tools/defs.hpp + + + +bin_PROGRAMS += tools/atf-config +tools_atf_config_SOURCES = tools/atf-config.cpp +tools_atf_config_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_atf_config_LDADD = $(TOOLS_LDADD) +dist_man_MANS += tools/atf-config.1 + +bin_PROGRAMS += tools/atf-report +tools_atf_report_SOURCES = tools/atf-report.cpp +tools_atf_report_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_atf_report_LDADD = $(TOOLS_LDADD) +dist_man_MANS += tools/atf-report.1 + +bin_PROGRAMS += tools/atf-run +tools_atf_run_CPPFLAGS = $(TOOLS_CPPFLAGS) "-DGDB=\"$(GDB)\"" +tools_atf_run_SOURCES = tools/atf-run.cpp +tools_atf_run_LDADD = $(TOOLS_LDADD) +dist_man_MANS += tools/atf-run.1 + +bin_PROGRAMS += tools/atf-version +tools_atf_version_SOURCES = tools/atf-version.cpp +nodist_tools_atf_version_SOURCES = tools/revision.h +tools_atf_version_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_atf_version_LDADD = $(TOOLS_LDADD) +dist_man_MANS += tools/atf-version.1 + +EXTRA_DIST += tools/generate-revision.sh + +BUILT_SOURCES += tools/revision.h +CLEANFILES += tools/revision.h +tools/revision.h: tools/revision.h.stamp + @test -d tools || mkdir -p tools + @cmp -s tools/revision.h tools/revision.h.stamp || \ + cp -p tools/revision.h.stamp tools/revision.h + +CLEANFILES += tools/revision.h.stamp +PHONY_TARGETS += tools/revision.h.stamp +tools/revision.h.stamp: + @test -d tools || mkdir -p tools + @$(top_srcdir)/tools/generate-revision.sh \ + -g "$(GIT)" -r $(top_srcdir) -o tools/revision.h.stamp \ + -v $(PACKAGE_VERSION) + + + +man_MANS += tools/atf.7 +CLEANFILES += tools/atf.7 +EXTRA_DIST += tools/atf.7.in + +dist_man_MANS += tools/atf-formats.5 + +tools/atf.7: $(srcdir)/tools/atf.7.in + test -d tools || mkdir -p tools + sed -e 's#__DOCDIR__#$(docdir)#g' \ + -e 's#__TESTSDIR__#$(testsdir)#g' \ + <$(srcdir)/tools/atf.7.in >tools/atf.7.tmp + mv tools/atf.7.tmp tools/atf.7 + + + +cssdir = $(atf_cssdir) +css_DATA = tools/tests-results.css +EXTRA_DIST += $(css_DATA) + +dtddir = $(atf_dtddir) +dtd_DATA = tools/tests-results.dtd +EXTRA_DIST += $(dtd_DATA) + +egdir = $(atf_egdir) +eg_DATA = tools/sample/atf-run.hooks +eg_DATA += tools/sample/common.conf +EXTRA_DIST += $(eg_DATA) + +hooksdir = $(pkgdatadir) +hooks_DATA = tools/share/atf-run.hooks +EXTRA_DIST += $(hooks_DATA) + +xsldir = $(atf_xsldir) +xsl_DATA = tools/tests-results.xsl +EXTRA_DIST += $(xsl_DATA) + + + +tests_tools_DATA = tools/Atffile tools/Kyuafile +tests_toolsdir = $(pkgtestsdir)/tools +EXTRA_DIST += $(tests_tools_DATA) + +tests_tools_SCRIPTS = tools/atf-config_test +CLEANFILES += tools/atf-config_test +EXTRA_DIST += tools/atf-config_test.sh +tools/atf-config_test: $(srcdir)/tools/atf-config_test.sh + @test -d tools || mkdir -p tools + @src="$(srcdir)/tools/atf-config_test.sh"; \ + dst="tools/atf-config_test"; $(BUILD_SH_TP) + +tests_tools_SCRIPTS += tools/atf-report_test +CLEANFILES += tools/atf-report_test +EXTRA_DIST += tools/atf-report_test.sh +tools/atf-report_test: $(srcdir)/tools/atf-report_test.sh + @test -d tools || mkdir -p tools + @src="$(srcdir)/tools/atf-report_test.sh"; \ + dst="tools/atf-report_test"; $(BUILD_SH_TP) + +tests_tools_SCRIPTS += tools/atf-run_test +CLEANFILES += tools/atf-run_test +EXTRA_DIST += tools/atf-run_test.sh +tools/atf-run_test: $(srcdir)/tools/atf-run_test.sh + @test -d tools || mkdir -p tools + @src="$(srcdir)/tools/atf-run_test.sh"; \ + dst="tools/atf-run_test"; $(BUILD_SH_TP) + +tests_tools_PROGRAMS = tools/application_test +tools_application_test_SOURCES = tools/application_test.cpp +tools_application_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_application_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/atffile_test +tools_atffile_test_SOURCES = tools/atffile_test.cpp +tools_atffile_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_atffile_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/auto_array_test +tools_auto_array_test_SOURCES = tools/auto_array_test.cpp +tools_auto_array_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_auto_array_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/bad_metadata_helper +tools_bad_metadata_helper_SOURCES = tools/bad_metadata_helper.c +tools_bad_metadata_helper_LDADD = libatf-c.la + +tests_tools_PROGRAMS += tools/config_test +tools_config_test_SOURCES = tools/config_test.cpp +tools_config_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_config_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/config_file_test +tools_config_file_test_SOURCES = tools/config_file_test.cpp +tools_config_file_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_config_file_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/env_test +tools_env_test_SOURCES = tools/env_test.cpp +tools_env_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_env_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/expand_test +tools_expand_test_SOURCES = tools/expand_test.cpp +tools_expand_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_expand_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/expect_helpers +tools_expect_helpers_SOURCES = tools/expect_helpers.c +tools_expect_helpers_LDADD = libatf-c.la + +tests_tools_PROGRAMS += tools/fail_helper +tools_fail_helper_SOURCES = tools/fail_helper.cpp +tools_fail_helper_LDADD = $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/fs_test +tools_fs_test_SOURCES = tools/fs_test.cpp +tools_fs_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_fs_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/io_test +tools_io_test_SOURCES = tools/io_test.cpp +tools_io_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_io_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/misc_helpers +tools_misc_helpers_SOURCES = tools/misc_helpers.cpp +tools_misc_helpers_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_misc_helpers_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/parser_test +tools_parser_test_SOURCES = tools/parser_test.cpp +tools_parser_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_parser_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/process_test +tools_process_test_SOURCES = tools/process_test.cpp +tools_process_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_process_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/pass_helper +tools_pass_helper_SOURCES = tools/pass_helper.cpp +tools_pass_helper_LDADD = $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/process_helpers +tools_process_helpers_SOURCES = tools/process_helpers.c + +tests_tools_PROGRAMS += tools/reader_test +tools_reader_test_SOURCES = tools/reader_test.cpp +tools_reader_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_reader_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/requirements_test +tools_requirements_test_SOURCES = tools/requirements_test.cpp +tools_requirements_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_requirements_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/several_tcs_helper +tools_several_tcs_helper_SOURCES = tools/several_tcs_helper.c +tools_several_tcs_helper_LDADD = libatf-c.la + +tests_tools_PROGRAMS += tools/signals_test +tools_signals_test_SOURCES = tools/signals_test.cpp tools/signals.cpp +tools_signals_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_signals_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/test_program_test +tools_test_program_test_SOURCES = tools/test_program_test.cpp +tools_test_program_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_test_program_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/text_test +tools_text_test_SOURCES = tools/text_test.cpp tools/text.cpp +tools_text_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_text_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/ui_test +tools_ui_test_SOURCES = tools/ui_test.cpp tools/ui.cpp +tools_ui_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_ui_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/user_test +tools_user_test_SOURCES = tools/user_test.cpp tools/user.cpp +tools_user_test_CPPFLAGS = $(TOOLS_CPPFLAGS) +tools_user_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) + +tests_tools_PROGRAMS += tools/zero_tcs_helper +tools_zero_tcs_helper_SOURCES = tools/zero_tcs_helper.c +tools_zero_tcs_helper_LDADD = libatf-c.la + +# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/tools/application.cpp b/tools/application.cpp new file mode 100644 index 000000000000..723e9f185640 --- /dev/null +++ b/tools/application.cpp @@ -0,0 +1,317 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if defined(HAVE_CONFIG_H) +#include "bconfig.h" +#endif + +extern "C" { +#include +} + +#include +#include +#include +#include +#include +#include + +#include "application.hpp" +#include "defs.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" + +// ------------------------------------------------------------------------ +// The "usage_error" class. +// ------------------------------------------------------------------------ + +impl::usage_error::usage_error(const char *fmt, ...) + throw() : + std::runtime_error("usage_error; message unformatted") +{ + va_list ap; + + va_start(ap, fmt); + std::vsnprintf(m_text, sizeof(m_text), fmt, ap); + va_end(ap); +} + +impl::usage_error::~usage_error(void) + throw() +{ +} + +const char* +impl::usage_error::what(void) + const throw() +{ + return m_text; +} + +// ------------------------------------------------------------------------ +// The "application" class. +// ------------------------------------------------------------------------ + +impl::option::option(char ch, + const std::string& a, + const std::string& desc) : + m_character(ch), + m_argument(a), + m_description(desc) +{ +} + +bool +impl::option::operator<(const impl::option& o) + const +{ + return m_character < o.m_character; +} + +impl::app::app(const std::string& description, + const std::string& manpage, + const std::string& global_manpage) : + m_hflag(false), + m_argc(-1), + m_argv(NULL), + m_prog_name(NULL), + m_description(description), + m_manpage(manpage), + m_global_manpage(global_manpage) +{ +} + +impl::app::~app(void) +{ +} + +bool +impl::app::inited(void) +{ + return m_argc != -1; +} + +impl::app::options_set +impl::app::options(void) +{ + options_set opts = specific_options(); + opts.insert(option('h', "", "Shows this help message")); + return opts; +} + +std::string +impl::app::specific_args(void) + const +{ + return ""; +} + +impl::app::options_set +impl::app::specific_options(void) + const +{ + return options_set(); +} + +void +impl::app::process_option(int ch ATF_DEFS_ATTRIBUTE_UNUSED, + const char* arg ATF_DEFS_ATTRIBUTE_UNUSED) +{ +} + +void +impl::app::process_options(void) +{ + assert(inited()); + + std::string optstr; +#if defined(HAVE_GNU_GETOPT) + optstr += '+'; // Turn on POSIX behavior. +#endif + optstr += ':'; + { + options_set opts = options(); + for (options_set::const_iterator iter = opts.begin(); + iter != opts.end(); iter++) { + const option& opt = (*iter); + + optstr += opt.m_character; + if (!opt.m_argument.empty()) + optstr += ':'; + } + } + + int ch; + const int old_opterr = ::opterr; + ::opterr = 0; + while ((ch = ::getopt(m_argc, m_argv, optstr.c_str())) != -1) { + switch (ch) { + case 'h': + m_hflag = true; + break; + + case ':': + throw usage_error("Option -%c requires an argument.", + ::optopt); + + case '?': + throw usage_error("Unknown option -%c.", ::optopt); + + default: + process_option(ch, ::optarg); + } + } + m_argc -= ::optind; + m_argv += ::optind; + + // 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 +impl::app::usage(std::ostream& os) +{ + assert(inited()); + + std::string args = specific_args(); + if (!args.empty()) + args = " " + args; + os << ui::format_text_with_tag(std::string(m_prog_name) + " [options]" + + args, "Usage: ", false) << "\n\n" + << ui::format_text(m_description) << "\n\n"; + + options_set opts = options(); + assert(!opts.empty()); + os << "Available options:\n"; + size_t coldesc = 0; + for (options_set::const_iterator iter = opts.begin(); + iter != opts.end(); iter++) { + const option& opt = (*iter); + + if (opt.m_argument.length() + 1 > coldesc) + coldesc = opt.m_argument.length() + 1; + } + for (options_set::const_iterator iter = opts.begin(); + iter != opts.end(); iter++) { + const option& opt = (*iter); + + std::string tag = std::string(" -") + opt.m_character; + if (opt.m_argument.empty()) + tag += " "; + else + tag += " " + opt.m_argument + " "; + os << ui::format_text_with_tag(opt.m_description, tag, false, + coldesc + 10) << "\n"; + } + os << "\n"; + + std::string gmp; + if (!m_global_manpage.empty()) + gmp = " and " + m_global_manpage; + os << ui::format_text("For more details please see " + m_manpage + + gmp + ".") + << "\n"; +} + +int +impl::app::run(int argc, char* const* argv) +{ + assert(argc > 0); + assert(argv != NULL); + + m_argc = argc; + m_argv = argv; + + m_argv0 = m_argv[0]; + + m_prog_name = std::strrchr(m_argv[0], '/'); + if (m_prog_name == NULL) + m_prog_name = m_argv[0]; + else + m_prog_name++; + + // Libtool workaround: if running from within the source tree (binaries + // that are not installed yet), skip the "lt-" prefix added to files in + // the ".libs" directory to show the real (not temporary) name. + if (std::strncmp(m_prog_name, "lt-", 3) == 0) + m_prog_name += 3; + + 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."; + + int errcode; + try { + int oldargc = m_argc; + + process_options(); + + if (m_hflag) { + if (oldargc != 2) + throw usage_error("-h must be given alone."); + + usage(std::cout); + errcode = EXIT_SUCCESS; + } else + errcode = main(); + } catch (const usage_error& e) { + std::cerr << ui::format_error(m_prog_name, e.what()) << "\n" + << ui::format_info(m_prog_name, std::string("Type `") + + m_prog_name + " -h' for more details.") + << "\n"; + errcode = EXIT_FAILURE; + } catch (const std::runtime_error& e) { + std::cerr << ui::format_error(m_prog_name, std::string(e.what())) + << "\n"; + errcode = EXIT_FAILURE; + } catch (const std::exception& e) { + std::cerr << ui::format_error(m_prog_name, std::string("Caught " + "unexpected error: ") + e.what() + "\n" + bug) << "\n"; + errcode = EXIT_FAILURE; + } catch (...) { + std::cerr << ui::format_error(m_prog_name, std::string("Caught " + "unknown error\n") + bug) << "\n"; + errcode = EXIT_FAILURE; + } + return errcode; +} diff --git a/tools/application.hpp b/tools/application.hpp new file mode 100644 index 000000000000..5a8d57c6e562 --- /dev/null +++ b/tools/application.hpp @@ -0,0 +1,113 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if !defined(TOOLS_APPLICATION_HPP) +#define TOOLS_APPLICATION_HPP + +#include +#include +#include +#include + +namespace tools { +namespace application { + +// ------------------------------------------------------------------------ +// The "usage_error" class. +// ------------------------------------------------------------------------ + +class usage_error : public std::runtime_error { + char m_text[4096]; + +public: + usage_error(const char*, ...) throw(); + ~usage_error(void) throw(); + + const char* what(void) const throw(); +}; + +// ------------------------------------------------------------------------ +// The "option" class. +// ------------------------------------------------------------------------ + +class option { + char m_character; + std::string m_argument; + std::string m_description; + + friend class app; + +public: + option(char, const std::string&, const std::string&); + + bool operator<(const option&) const; +}; + +// ------------------------------------------------------------------------ +// The "app" class. +// ------------------------------------------------------------------------ + +class app { + bool m_hflag; + + void process_options(void); + void usage(std::ostream&); + + bool inited(void); + +protected: + typedef std::set< option > options_set; + + int m_argc; + char* const* m_argv; + + const char* m_argv0; + const char* m_prog_name; + std::string m_description; + std::string m_manpage, m_global_manpage; + + options_set options(void); + + // To be redefined. + virtual std::string specific_args(void) const; + virtual options_set specific_options(void) const; + virtual void process_option(int, const char*); + virtual int main(void) = 0; + +public: + app(const std::string&, const std::string&, const std::string&); + virtual ~app(void); + + int run(int, char* const*); +}; + +} // namespace application +} // namespace tools + +#endif // !defined(TOOLS_APPLICATION_HPP) diff --git a/tools/application_test.cpp b/tools/application_test.cpp new file mode 100644 index 000000000000..a9013cdc6be0 --- /dev/null +++ b/tools/application_test.cpp @@ -0,0 +1,94 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2009 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +extern "C" { +#include +} + +#include + +#include "application.hpp" + +class getopt_app : public tools::application::app { +public: + getopt_app(void) : app("description", "manpage", "other") {} + + int main(void) + { + // Provide an option that is unknown to the application driver and + // one that is, together with an argument that would be swallowed by + // the test program option if it were recognized. + int argc = 4; + char arg1[] = "progname"; + char arg2[] = "-Z"; + char arg3[] = "-s"; + char arg4[] = "foo"; + char *const argv[] = { arg1, arg2, arg3, arg4, NULL }; + + int ch; + bool zflag; + + // Given that this obviously is an application, and that we used the + // same driver to start, we can test getopt(3) right here without doing + // any fancy stuff. + zflag = false; + while ((ch = ::getopt(argc, argv, ":Z")) != -1) { + switch (ch) { + case 'Z': + zflag = true; + break; + + case '?': + default: + if (optopt != 's') + ATF_FAIL("Unexpected unknown option found"); + } + } + + ATF_REQUIRE(zflag); + ATF_REQUIRE_EQ(1, argc - optind); + ATF_REQUIRE_EQ(std::string("foo"), argv[optind]); + + return 0; + } +}; + +ATF_TEST_CASE_WITHOUT_HEAD(getopt); +ATF_TEST_CASE_BODY(getopt) +{ + int argc = 1; + char arg1[] = "progname"; + char *const argv[] = { arg1, NULL }; + ATF_REQUIRE_EQ(0, getopt_app().run(argc, argv)); +} + +ATF_INIT_TEST_CASES(tcs) +{ + ATF_ADD_TEST_CASE(tcs, getopt); +} diff --git a/atf-config/atf-config.1 b/tools/atf-config.1 similarity index 100% rename from atf-config/atf-config.1 rename to tools/atf-config.1 diff --git a/atf-config/atf-config.cpp b/tools/atf-config.cpp similarity index 88% rename from atf-config/atf-config.cpp rename to tools/atf-config.cpp index e5fdca1950e4..4d82d55e636b 100644 --- a/atf-config/atf-config.cpp +++ b/tools/atf-config.cpp @@ -32,16 +32,11 @@ #include #include -extern "C" { -#include "atf-c/defs.h" -} +#include "application.hpp" +#include "config.hpp" +#include "defs.hpp" -#include "atf-c++/config.hpp" - -#include "atf-c++/detail/application.hpp" -#include "atf-c++/detail/sanity.hpp" - -class atf_config : public atf::application::app { +class atf_config : public tools::application::app { static const char* m_description; bool m_tflag; @@ -79,7 +74,7 @@ atf_config::process_option(int ch, const char* arg ATF_DEFS_ATTRIBUTE_UNUSED) break; default: - UNREACHABLE; + std::abort(); } } @@ -94,7 +89,7 @@ atf_config::options_set atf_config::specific_options(void) const { - using atf::application::option; + using tools::application::option; options_set opts; opts.insert(option('t', "", "Terse output: show values only")); return opts; @@ -117,20 +112,20 @@ int atf_config::main(void) { if (m_argc < 1) { - std::map< std::string, std::string > cv = atf::config::get_all(); + std::map< std::string, std::string > cv = tools::config::get_all(); for (std::map< std::string, std::string >::const_iterator iter = cv.begin(); iter != cv.end(); iter++) std::cout << format_var((*iter).first, (*iter).second) << "\n"; } else { for (int i = 0; i < m_argc; i++) { - if (!atf::config::has(m_argv[i])) + if (!tools::config::has(m_argv[i])) throw std::runtime_error(std::string("Unknown variable `") + m_argv[i] + "'"); } for (int i = 0; i < m_argc; i++) { - std::cout << format_var(m_argv[i], atf::config::get(m_argv[i])) + std::cout << format_var(m_argv[i], tools::config::get(m_argv[i])) << "\n"; } } diff --git a/atf-config/integration_test.sh b/tools/atf-config_test.sh old mode 100644 new mode 100755 similarity index 100% rename from atf-config/integration_test.sh rename to tools/atf-config_test.sh diff --git a/doc/atf-formats.5 b/tools/atf-formats.5 similarity index 100% rename from doc/atf-formats.5 rename to tools/atf-formats.5 diff --git a/atf-report/atf-report.1 b/tools/atf-report.1 similarity index 100% rename from atf-report/atf-report.1 rename to tools/atf-report.1 diff --git a/atf-report/atf-report.cpp b/tools/atf-report.cpp similarity index 93% rename from atf-report/atf-report.cpp rename to tools/atf-report.cpp index 359b58b2307a..cb065f993ed9 100644 --- a/atf-report/atf-report.cpp +++ b/tools/atf-report.cpp @@ -41,20 +41,17 @@ extern "C" { #include #include -#include "atf-c/defs.h" - -#include "atf-c++/detail/application.hpp" -#include "atf-c++/detail/fs.hpp" -#include "atf-c++/detail/sanity.hpp" -#include "atf-c++/detail/text.hpp" -#include "atf-c++/detail/ui.hpp" - +#include "application.hpp" +#include "defs.hpp" +#include "fs.hpp" #include "reader.hpp" +#include "text.hpp" +#include "ui.hpp" typedef std::auto_ptr< std::ostream > ostream_ptr; static ostream_ptr -open_outfile(const atf::fs::path& path) +open_outfile(const tools::fs::path& path) { ostream_ptr osp; if (path.str() == "-") @@ -128,7 +125,7 @@ class csv_writer : public writer { std::string m_tcname; public: - csv_writer(const atf::fs::path& p) : + csv_writer(const tools::fs::path& p) : m_os(open_outfile(p)) { } @@ -223,8 +220,8 @@ class ticker_writer : public writer { void write_tp_start(const std::string& tp, size_t ntcs) { - using atf::text::to_string; - using atf::ui::format_text; + using tools::text::to_string; + using tools::ui::format_text; m_tpname = tp; @@ -238,7 +235,7 @@ class ticker_writer : public writer { void write_tp_end(struct timeval* tv, const std::string& reason) { - using atf::ui::format_text_with_tag; + using tools::ui::format_text_with_tag; m_curtp++; @@ -290,7 +287,7 @@ class ticker_writer : public writer { str = "Skipped: " + reason; m_tcs_skipped++; } else - UNREACHABLE; + std::abort(); // XXX Wrap text. format_text_with_tag does not currently allow // to specify the current column, which is needed because we have @@ -304,8 +301,8 @@ class ticker_writer : public writer { write_expected_failures(const std::map< std::string, std::string >& xfails, std::ostream& os) { - using atf::ui::format_text; - using atf::ui::format_text_with_tag; + using tools::ui::format_text; + using tools::ui::format_text_with_tag; os << format_text("Test cases for known bugs:") << "\n"; @@ -322,10 +319,10 @@ class ticker_writer : public writer { void write_eof(void) { - using atf::text::join; - using atf::text::to_string; - using atf::ui::format_text; - using atf::ui::format_text_with_tag; + using tools::text::join; + using tools::text::to_string; + using tools::ui::format_text; + using tools::ui::format_text_with_tag; if (!m_failed_tps.empty()) { (*m_os) << format_text("Failed (bogus) test programs:") @@ -362,7 +359,7 @@ class ticker_writer : public writer { } public: - ticker_writer(const atf::fs::path& p) : + ticker_writer(const tools::fs::path& p) : m_os(open_outfile(p)) { } @@ -473,7 +470,7 @@ class xml_writer : public writer { } else if (state == "skipped") { (*m_os) << "" << elemval(reason) << "\n"; } else - UNREACHABLE; + std::abort(); (*m_os) << "" << format_tv(tv) << ""; (*m_os) << "\n"; } @@ -485,7 +482,7 @@ class xml_writer : public writer { } public: - xml_writer(const atf::fs::path& p) : + xml_writer(const tools::fs::path& p) : m_os(open_outfile(p)) { (*m_os) << "\n" @@ -507,7 +504,7 @@ class xml_writer : public writer { //! raised by the parser, redirects it to multiple writers so that they //! can reformat it according to their output rules. //! -class converter : public atf::atf_report::atf_tps_reader { +class converter : public tools::atf_report::atf_tps_reader { typedef std::vector< writer* > outs_vector; outs_vector m_outs; @@ -586,7 +583,7 @@ class converter : public atf::atf_report::atf_tps_reader { public: converter(std::istream& is) : - atf::atf_report::atf_tps_reader(is) + tools::atf_report::atf_tps_reader(is) { } @@ -598,7 +595,7 @@ class converter : public atf::atf_report::atf_tps_reader { } void - add_output(const std::string& fmt, const atf::fs::path& p) + add_output(const std::string& fmt, const tools::fs::path& p) { if (fmt == "csv") { m_outs.push_back(new csv_writer(p)); @@ -615,10 +612,10 @@ class converter : public atf::atf_report::atf_tps_reader { // The "atf_report" class. // ------------------------------------------------------------------------ -class atf_report : public atf::application::app { +class atf_report : public tools::application::app { static const char* m_description; - typedef std::pair< std::string, atf::fs::path > fmt_path_pair; + typedef std::pair< std::string, tools::fs::path > fmt_path_pair; std::vector< fmt_path_pair > m_oflags; void process_option(int, const char*); @@ -651,14 +648,14 @@ atf_report::process_option(int ch, const char* arg) throw std::runtime_error("Syntax error in -o option"); else { std::string fmt = str.substr(0, pos); - atf::fs::path path = atf::fs::path(str.substr(pos + 1)); + tools::fs::path path = tools::fs::path(str.substr(pos + 1)); m_oflags.push_back(fmt_path_pair(fmt, path)); } } break; default: - UNREACHABLE; + std::abort(); } } @@ -666,7 +663,7 @@ atf_report::options_set atf_report::specific_options(void) const { - using atf::application::option; + using tools::application::option; options_set opts; opts.insert(option('o', "fmt:path", "Adds a new output file; multiple " "ones can be specified, and a - " @@ -681,15 +678,15 @@ atf_report::main(void) throw std::runtime_error("No arguments allowed"); if (m_oflags.empty()) - m_oflags.push_back(fmt_path_pair("ticker", atf::fs::path("-"))); + m_oflags.push_back(fmt_path_pair("ticker", tools::fs::path("-"))); // Look for path duplicates. - std::set< atf::fs::path > paths; + std::set< tools::fs::path > paths; for (std::vector< fmt_path_pair >::const_iterator iter = m_oflags.begin(); iter != m_oflags.end(); iter++) { - atf::fs::path p = (*iter).second; - if (p == atf::fs::path("/dev/stdout")) - p = atf::fs::path("-"); + tools::fs::path p = (*iter).second; + if (p == tools::fs::path("/dev/stdout")) + p = tools::fs::path("-"); if (paths.find(p) != paths.end()) throw std::runtime_error("The file `" + p.str() + "' was " "specified more than once"); diff --git a/atf-report/integration_test.sh b/tools/atf-report_test.sh old mode 100644 new mode 100755 similarity index 99% rename from atf-report/integration_test.sh rename to tools/atf-report_test.sh index b19346a86c3f..9f0f47fc61cf --- a/atf-report/integration_test.sh +++ b/tools/atf-report_test.sh @@ -105,7 +105,7 @@ default_body() atf_test_case expect expect_body() { - ln -s "$(atf_get_srcdir)/../atf-run/expect_helpers" . + ln -s "$(atf_get_srcdir)/expect_helpers" . cat >Atffile <Atffile < +#include #include #include #include @@ -48,25 +49,24 @@ extern "C" { #include #include -#include "atf-c++/detail/application.hpp" -#include "atf-c++/config.hpp" -#include "atf-c++/tests.hpp" - -#include "atf-c++/detail/env.hpp" -#include "atf-c++/detail/exceptions.hpp" -#include "atf-c++/detail/fs.hpp" -#include "atf-c++/detail/parser.hpp" -#include "atf-c++/detail/process.hpp" -#include "atf-c++/detail/sanity.hpp" -#include "atf-c++/detail/text.hpp" - +#include "application.hpp" #include "atffile.hpp" #include "config.hpp" +#include "config_file.hpp" +#include "env.hpp" +#include "exceptions.hpp" #include "fs.hpp" +#include "parser.hpp" +#include "process.hpp" #include "requirements.hpp" #include "test-program.hpp" +#include "text.hpp" -namespace impl = atf::atf_run; +namespace { + +typedef std::map< std::string, std::string > vars_map; + +} // anonymous namespace #if defined(MAXCOMLEN) static const std::string::size_type max_core_name_length = MAXCOMLEN; @@ -74,12 +74,12 @@ static const std::string::size_type max_core_name_length = MAXCOMLEN; static const std::string::size_type max_core_name_length = std::string::npos; #endif -class atf_run : public atf::application::app { +class atf_run : public tools::application::app { static const char* m_description; - atf::tests::vars_map m_cmdline_vars; + vars_map m_cmdline_vars; - static atf::tests::vars_map::value_type parse_var(const std::string&); + static vars_map::value_type parse_var(const std::string&); void process_option(int, const char*); std::string specific_args(void) const; @@ -91,14 +91,17 @@ class atf_run : public atf::application::app { size_t count_tps(std::vector< std::string >) const; - int run_test(const atf::fs::path&, impl::atf_tps_writer&, - const atf::tests::vars_map&); - int run_test_directory(const atf::fs::path&, impl::atf_tps_writer&); - int run_test_program(const atf::fs::path&, impl::atf_tps_writer&, - const atf::tests::vars_map&); + int run_test(const tools::fs::path&, 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&, + tools::test_program::atf_tps_writer&, + const vars_map&); - impl::test_case_result get_test_case_result(const std::string&, - const atf::process::status&, const atf::fs::path&) const; + tools::test_program::test_case_result get_test_case_result( + const std::string&, const tools::process::status&, + const tools::fs::path&) const; public: atf_run(void); @@ -110,7 +113,7 @@ static void sanitize_gdb_env(void) { try { - atf::env::unset("TERM"); + tools::env::unset("TERM"); } catch (...) { // Just swallow exceptions here; they cannot propagate into C, which // is where this function is called from, and even if these exceptions @@ -119,29 +122,30 @@ sanitize_gdb_env(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) +dump_stacktrace(const tools::fs::path& tp, const tools::process::status& s, + const tools::fs::path& workdir, + tools::test_program::atf_tps_writer& w) { - PRE(s.signaled() && s.coredump()); + assert(s.signaled() && s.coredump()); w.stderr_tc("Test program crashed; attempting to get stack trace"); - const atf::fs::path corename = workdir / + const tools::fs::path corename = workdir / (tp.leaf_name().substr(0, max_core_name_length) + ".core"); - if (!atf::fs::exists(corename)) { + if (!tools::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", + const tools::fs::path gdb(GDB); + const tools::fs::path gdbout = workdir / "gdb.out"; + const tools::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( + tools::process::status status = tools::process::exec( gdb, args, - atf::process::stream_redirect_path(gdbout), - atf::process::stream_redirect_path(atf::fs::path("/dev/null")), + tools::process::stream_redirect_path(gdbout), + tools::process::stream_redirect_path(tools::fs::path("/dev/null")), sanitize_gdb_env); if (!status.exited() || status.exitstatus() != EXIT_SUCCESS) { w.stderr_tc("Execution of " GDB " failed"); @@ -177,7 +181,7 @@ atf_run::process_option(int ch, const char* arg) break; default: - UNREACHABLE; + std::abort(); } } @@ -192,7 +196,7 @@ atf_run::options_set atf_run::specific_options(void) const { - using atf::application::option; + using tools::application::option; options_set opts; opts.insert(option('v', "var=value", "Sets the configuration variable " "`var' to `value'; overrides " @@ -206,7 +210,7 @@ atf_run::parse_vflag(const std::string& str) if (str.empty()) throw std::runtime_error("-v requires a non-empty argument"); - std::vector< std::string > ws = atf::text::split(str, "="); + std::vector< std::string > ws = tools::text::split(str, "="); if (ws.size() == 1 && str[str.length() - 1] == '=') { m_cmdline_vars[ws[0]] = ""; } else { @@ -219,18 +223,18 @@ atf_run::parse_vflag(const std::string& str) } int -atf_run::run_test(const atf::fs::path& tp, - impl::atf_tps_writer& w, - const atf::tests::vars_map& config) +atf_run::run_test(const tools::fs::path& tp, + tools::test_program::atf_tps_writer& w, + const vars_map& config) { - atf::fs::file_info fi(tp); + tools::fs::file_info fi(tp); int errcode; - if (fi.get_type() == atf::fs::file_info::dir_type) + if (fi.get_type() == tools::fs::file_info::dir_type) errcode = run_test_directory(tp, w); else { - const atf::tests::vars_map effective_config = - impl::merge_configs(config, m_cmdline_vars); + const vars_map effective_config = + tools::config_file::merge_configs(config, m_cmdline_vars); errcode = run_test_program(tp, w, effective_config); } @@ -238,39 +242,38 @@ atf_run::run_test(const atf::fs::path& tp, } int -atf_run::run_test_directory(const atf::fs::path& tp, - impl::atf_tps_writer& w) +atf_run::run_test_directory(const tools::fs::path& tp, + tools::test_program::atf_tps_writer& w) { - impl::atffile af = impl::read_atffile(tp / "Atffile"); + tools::atffile af = tools::read_atffile(tp / "Atffile"); - atf::tests::vars_map test_suite_vars; + vars_map test_suite_vars; { - atf::tests::vars_map::const_iterator iter = - af.props().find("test-suite"); - INV(iter != af.props().end()); - test_suite_vars = impl::read_config_files((*iter).second); + vars_map::const_iterator iter = af.props().find("test-suite"); + assert(iter != af.props().end()); + test_suite_vars = tools::config_file::read_config_files((*iter).second); } 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, - impl::merge_configs(af.conf(), test_suite_vars)); + tools::config_file::merge_configs(af.conf(), test_suite_vars)); ok &= (result == EXIT_SUCCESS); } return ok ? EXIT_SUCCESS : EXIT_FAILURE; } -impl::test_case_result +tools::test_program::test_case_result atf_run::get_test_case_result(const std::string& broken_reason, - const atf::process::status& s, - const atf::fs::path& resfile) + const tools::process::status& s, + const tools::fs::path& resfile) const { - using atf::text::to_string; - using impl::read_test_case_result; - using impl::test_case_result; + using tools::text::to_string; + using tools::test_program::read_test_case_result; + using tools::test_program::test_case_result; if (!broken_reason.empty()) { test_case_result tcr; @@ -343,7 +346,7 @@ atf_run::get_test_case_result(const std::string& broken_reason, tcr = read_test_case_result(resfile); } catch (const std::runtime_error&) { return test_case_result("failed", -1, "Test program received " - "signal " + atf::text::to_string(s.termsig()) + + "signal " + tools::text::to_string(s.termsig()) + (s.coredump() ? " (core dumped)" : "")); } @@ -358,53 +361,53 @@ atf_run::get_test_case_result(const std::string& broken_reason, " signal but got " + to_string(s.termsig())); } else { return test_case_result("failed", -1, "Test program received " - "signal " + atf::text::to_string(s.termsig()) + + "signal " + tools::text::to_string(s.termsig()) + (s.coredump() ? " (core dumped)" : "") + " and created a " "bogus results file"); } } - UNREACHABLE; + std::abort(); return test_case_result(); } int -atf_run::run_test_program(const atf::fs::path& tp, - impl::atf_tps_writer& w, - const atf::tests::vars_map& config) +atf_run::run_test_program(const tools::fs::path& tp, + tools::test_program::atf_tps_writer& w, + const vars_map& config) { int errcode = EXIT_SUCCESS; - impl::metadata md; + tools::test_program::metadata md; try { - md = impl::get_metadata(tp, config); - } catch (const atf::parser::format_error& e) { + md = tools::test_program::get_metadata(tp, config); + } catch (const tools::parser::format_error& e) { w.start_tp(tp.str(), 0); w.end_tp("Invalid format for test case list: " + std::string(e.what())); return EXIT_FAILURE; - } catch (const atf::parser::parse_errors& e) { - const std::string reason = atf::text::join(e, "; "); + } catch (const tools::parser::parse_errors& e) { + const std::string reason = tools::text::join(e, "; "); w.start_tp(tp.str(), 0); w.end_tp("Invalid format for test case list: " + reason); return EXIT_FAILURE; } - impl::temp_dir resdir(atf::fs::path(atf::config::get("atf_workdir")) / - "atf-run.XXXXXX"); + tools::fs::temp_dir resdir( + tools::fs::path(tools::config::get("atf_workdir")) / "atf-run.XXXXXX"); w.start_tp(tp.str(), md.test_cases.size()); if (md.test_cases.empty()) { w.end_tp("Bogus test program: reported 0 test cases"); errcode = EXIT_FAILURE; } else { - for (std::map< std::string, atf::tests::vars_map >::const_iterator iter + 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; - const atf::tests::vars_map& tcmd = (*iter).second; + const vars_map& tcmd = (*iter).second; w.start_tc(tcname); try { - const std::string& reqfail = impl::check_requirements( + const std::string& reqfail = tools::check_requirements( tcmd, config); if (!reqfail.empty()) { w.end_tc("skipped", reqfail); @@ -416,51 +419,53 @@ atf_run::run_test_program(const atf::fs::path& tp, continue; } - const std::pair< int, int > user = impl::get_required_user( + const std::pair< int, int > user = tools::get_required_user( tcmd, config); - atf::fs::path resfile = resdir.get_path() / "tcr"; - INV(!atf::fs::exists(resfile)); + tools::fs::path resfile = resdir.get_path() / "tcr"; + assert(!tools::fs::exists(resfile)); try { - const bool has_cleanup = atf::text::to_bool( + const bool has_cleanup = tools::text::to_bool( (*tcmd.find("has.cleanup")).second); - impl::temp_dir workdir(atf::fs::path(atf::config::get( + tools::fs::temp_dir workdir(tools::fs::path(tools::config::get( "atf_workdir")) / "atf-run.XXXXXX"); if (user.first != -1 && user.second != -1) { if (::chown(workdir.get_path().c_str(), user.first, user.second) == -1) { - throw atf::system_error("chown(" + + throw tools::system_error("chown(" + workdir.get_path().str() + ")", "chown(2) failed", errno); } resfile = workdir.get_path() / "tcr"; } - std::pair< std::string, const atf::process::status > s = - impl::run_test_case(tp, tcname, "body", tcmd, config, - resfile, workdir.get_path(), w); + std::pair< std::string, const tools::process::status > s = + tools::test_program::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); + (void)tools::test_program::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); + tools::test_program::test_case_result tcr = + get_test_case_result(s.first, s.second, resfile); w.end_tc(tcr.state(), tcr.reason()); if (tcr.state() == "failed") errcode = EXIT_FAILURE; } catch (...) { - if (atf::fs::exists(resfile)) - atf::fs::remove(resfile); + if (tools::fs::exists(resfile)) + tools::fs::remove(resfile); throw; } - if (atf::fs::exists(resfile)) - atf::fs::remove(resfile); + if (tools::fs::exists(resfile)) + tools::fs::remove(resfile); } w.end_tp(""); @@ -477,11 +482,11 @@ atf_run::count_tps(std::vector< std::string > tps) for (std::vector< std::string >::const_iterator iter = tps.begin(); iter != tps.end(); iter++) { - atf::fs::path tp(*iter); - atf::fs::file_info fi(tp); + tools::fs::path tp(*iter); + tools::fs::file_info fi(tp); - if (fi.get_type() == atf::fs::file_info::dir_type) { - impl::atffile af = impl::read_atffile(tp / "Atffile"); + if (fi.get_type() == tools::fs::file_info::dir_type) { + tools::atffile af = tools::read_atffile(tp / "Atffile"); std::vector< std::string > aux = af.tps(); for (std::vector< std::string >::iterator i2 = aux.begin(); i2 != aux.end(); i2++) @@ -498,16 +503,16 @@ static void call_hook(const std::string& tool, const std::string& hook) { - const atf::fs::path sh(atf::config::get("atf_shell")); - const atf::fs::path hooks = - atf::fs::path(atf::config::get("atf_pkgdatadir")) / (tool + ".hooks"); + const tools::fs::path sh(tools::config::get("atf_shell")); + const tools::fs::path hooks = + tools::fs::path(tools::config::get("atf_pkgdatadir")) / (tool + ".hooks"); - const atf::process::status s = - atf::process::exec(sh, - atf::process::argv_array(sh.c_str(), hooks.c_str(), + const tools::process::status s = + tools::process::exec(sh, + tools::process::argv_array(sh.c_str(), hooks.c_str(), hook.c_str(), NULL), - atf::process::stream_inherit(), - atf::process::stream_inherit()); + tools::process::stream_inherit(), + tools::process::stream_inherit()); if (!s.exited() || s.exitstatus() != EXIT_SUCCESS) @@ -518,7 +523,7 @@ call_hook(const std::string& tool, const std::string& hook) int atf_run::main(void) { - impl::atffile af = impl::read_atffile(atf::fs::path("Atffile")); + tools::atffile af = tools::read_atffile(tools::fs::path("Atffile")); std::vector< std::string > tps; tps = af.tps(); @@ -531,23 +536,22 @@ atf_run::main(void) } // Read configuration data for this test suite. - atf::tests::vars_map test_suite_vars; + vars_map test_suite_vars; { - atf::tests::vars_map::const_iterator iter = - af.props().find("test-suite"); - INV(iter != af.props().end()); - test_suite_vars = impl::read_config_files((*iter).second); + vars_map::const_iterator iter = af.props().find("test-suite"); + assert(iter != af.props().end()); + test_suite_vars = tools::config_file::read_config_files((*iter).second); } - impl::atf_tps_writer w(std::cout); + tools::test_program::atf_tps_writer w(std::cout); call_hook("atf-run", "info_start_hook"); w.ntps(count_tps(tps)); bool ok = true; for (std::vector< std::string >::const_iterator iter = tps.begin(); iter != tps.end(); iter++) { - const bool result = run_test(atf::fs::path(*iter), w, - impl::merge_configs(af.conf(), test_suite_vars)); + const bool result = run_test(tools::fs::path(*iter), w, + tools::config_file::merge_configs(af.conf(), test_suite_vars)); ok &= (result == EXIT_SUCCESS); } diff --git a/atf-run/integration_test.sh b/tools/atf-run_test.sh old mode 100644 new mode 100755 similarity index 100% rename from atf-run/integration_test.sh rename to tools/atf-run_test.sh diff --git a/atf-version/atf-version.1 b/tools/atf-version.1 similarity index 100% rename from atf-version/atf-version.1 rename to tools/atf-version.1 diff --git a/atf-version/atf-version.cpp b/tools/atf-version.cpp similarity index 93% rename from atf-version/atf-version.cpp rename to tools/atf-version.cpp index dfd092c74902..0a13e7ecd99e 100644 --- a/atf-version/atf-version.cpp +++ b/tools/atf-version.cpp @@ -34,12 +34,11 @@ #include #include -#include "atf-c++/detail/application.hpp" -#include "atf-c++/detail/ui.hpp" - +#include "application.hpp" #include "revision.h" +#include "ui.hpp" -class atf_version : public atf::application::app { +class atf_version : public tools::application::app { static const char* m_description; public: @@ -60,8 +59,8 @@ atf_version::atf_version(void) : int atf_version::main(void) { - using atf::ui::format_text; - using atf::ui::format_text_with_tag; + using tools::ui::format_text; + using tools::ui::format_text_with_tag; std::cout << PACKAGE_STRING " (" PACKAGE_TARNAME "-" PACKAGE_VERSION ")\n" PACKAGE_COPYRIGHT "\n\n"; diff --git a/doc/atf.7.in b/tools/atf.7.in similarity index 100% rename from doc/atf.7.in rename to tools/atf.7.in diff --git a/atf-run/atffile.cpp b/tools/atffile.cpp similarity index 79% rename from atf-run/atffile.cpp rename to tools/atffile.cpp index 22ece645d5fb..b04c59ed3bc0 100644 --- a/atf-run/atffile.cpp +++ b/tools/atffile.cpp @@ -27,19 +27,24 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +#include +#include #include -#include "atf-c/defs.h" - -#include "atf-c++/detail/exceptions.hpp" -#include "atf-c++/detail/expand.hpp" -#include "atf-c++/detail/parser.hpp" -#include "atf-c++/detail/sanity.hpp" - #include "atffile.hpp" +#include "defs.hpp" +#include "exceptions.hpp" +#include "expand.hpp" +#include "parser.hpp" -namespace impl = atf::atf_run; -namespace detail = atf::atf_run::detail; +namespace impl = tools; +namespace detail = tools::detail; + +namespace { + +typedef std::map< std::string, std::string > vars_map; + +} // anonymous namespace // ------------------------------------------------------------------------ // The "atf_atffile" auxiliary parser. @@ -47,22 +52,22 @@ namespace detail = atf::atf_run::detail; namespace atf_atffile { -static const atf::parser::token_type eof_type = 0; -static const atf::parser::token_type nl_type = 1; -static const atf::parser::token_type text_type = 2; -static const atf::parser::token_type colon_type = 3; -static const atf::parser::token_type conf_type = 4; -static const atf::parser::token_type dblquote_type = 5; -static const atf::parser::token_type equal_type = 6; -static const atf::parser::token_type hash_type = 7; -static const atf::parser::token_type prop_type = 8; -static const atf::parser::token_type tp_type = 9; -static const atf::parser::token_type tp_glob_type = 10; +static const tools::parser::token_type eof_type = 0; +static const tools::parser::token_type nl_type = 1; +static const tools::parser::token_type text_type = 2; +static const tools::parser::token_type colon_type = 3; +static const tools::parser::token_type conf_type = 4; +static const tools::parser::token_type dblquote_type = 5; +static const tools::parser::token_type equal_type = 6; +static const tools::parser::token_type hash_type = 7; +static const tools::parser::token_type prop_type = 8; +static const tools::parser::token_type tp_type = 9; +static const tools::parser::token_type tp_glob_type = 10; -class tokenizer : public atf::parser::tokenizer< std::istream > { +class tokenizer : public tools::parser::tokenizer< std::istream > { public: tokenizer(std::istream& is, size_t curline) : - atf::parser::tokenizer< std::istream > + tools::parser::tokenizer< std::istream > (is, true, eof_type, nl_type, text_type, curline) { add_delim(':', colon_type); @@ -120,20 +125,20 @@ detail::atf_atffile_reader::got_eof(void) void detail::atf_atffile_reader::read(void) { - using atf::parser::parse_error; + using tools::parser::parse_error; using namespace atf_atffile; - std::pair< size_t, atf::parser::headers_map > hml = - atf::parser::read_headers(m_is, 1); - atf::parser::validate_content_type(hml.second, + std::pair< size_t, tools::parser::headers_map > hml = + tools::parser::read_headers(m_is, 1); + tools::parser::validate_content_type(hml.second, "application/X-atf-atffile", 1); tokenizer tkz(m_is, hml.first); - atf::parser::parser< tokenizer > p(tkz); + tools::parser::parser< tokenizer > p(tkz); for (;;) { try { - atf::parser::token t = + tools::parser::token t = p.expect(conf_type, hash_type, prop_type, tp_type, tp_glob_type, nl_type, eof_type, "conf, #, prop, tp, tp-glob, a new line or eof"); @@ -175,7 +180,7 @@ detail::atf_atffile_reader::read(void) } else if (t.type() == nl_type) { continue; } else - UNREACHABLE; + std::abort(); t = p.expect(nl_type, hash_type, eof_type, "new line or comment"); @@ -198,8 +203,8 @@ detail::atf_atffile_reader::read(void) // ------------------------------------------------------------------------ class reader : public detail::atf_atffile_reader { - const atf::fs::directory& m_dir; - atf::tests::vars_map m_conf, m_props; + const tools::fs::directory& m_dir; + vars_map m_conf, m_props; std::vector< std::string > m_tps; void @@ -207,7 +212,7 @@ class reader : public detail::atf_atffile_reader { { if (isglob) { std::vector< std::string > ms = - atf::expand::expand_glob(name, m_dir.names()); + tools::expand::expand_glob(name, m_dir.names()); // Cannot use m_tps.insert(iterator, begin, end) here because it // does not work under Solaris. for (std::vector< std::string >::const_iterator iter = ms.begin(); @@ -215,9 +220,9 @@ class reader : public detail::atf_atffile_reader { m_tps.push_back(*iter); } else { if (m_dir.find(name) == m_dir.end()) - throw atf::not_found_error< atf::fs::path > + throw tools::not_found_error< tools::fs::path > ("Cannot locate the " + name + " file", - atf::fs::path(name)); + tools::fs::path(name)); m_tps.push_back(name); } } @@ -235,20 +240,20 @@ class reader : public detail::atf_atffile_reader { } public: - reader(std::istream& is, const atf::fs::directory& dir) : + reader(std::istream& is, const tools::fs::directory& dir) : detail::atf_atffile_reader(is), m_dir(dir) { } - const atf::tests::vars_map& + const vars_map& conf(void) const { return m_conf; } - const atf::tests::vars_map& + const vars_map& props(void) const { @@ -267,14 +272,14 @@ class reader : public detail::atf_atffile_reader { // The "atffile" class. // ------------------------------------------------------------------------ -impl::atffile::atffile(const atf::tests::vars_map& config_vars, +impl::atffile::atffile(const vars_map& config_vars, const std::vector< std::string >& test_program_names, - const atf::tests::vars_map& properties) : + const vars_map& properties) : m_conf(config_vars), m_tps(test_program_names), m_props(properties) { - PRE(properties.find("test-suite") != properties.end()); + assert(properties.find("test-suite") != properties.end()); } const std::vector< std::string >& @@ -284,14 +289,14 @@ impl::atffile::tps(void) return m_tps; } -const atf::tests::vars_map& +const vars_map& impl::atffile::conf(void) const { return m_conf; } -const atf::tests::vars_map& +const vars_map& impl::atffile::props(void) const { @@ -305,16 +310,16 @@ impl::atffile::props(void) // XXX Glob expansion and file existance checks certainly do not belong in // a *parser*. This needs to be taken out... impl::atffile -impl::read_atffile(const atf::fs::path& filename) +impl::read_atffile(const tools::fs::path& filename) { // Scan the directory where the atffile lives in to gather a list of // all possible test programs in it. - fs::directory dir(filename.branch_path()); + tools::fs::directory dir(filename.branch_path()); dir.erase(filename.leaf_name()); - fs::directory::iterator iter = dir.begin(); + tools::fs::directory::iterator iter = dir.begin(); while (iter != dir.end()) { const std::string& name = (*iter).first; - const fs::file_info& fi = (*iter).second; + const tools::fs::file_info& fi = (*iter).second; // Discard hidden files and non-executable ones so that they are // not candidates for glob matching. @@ -328,7 +333,7 @@ impl::read_atffile(const atf::fs::path& filename) // Parse the atffile. std::ifstream is(filename.c_str()); if (!is) - throw atf::not_found_error< fs::path > + throw tools::not_found_error< tools::fs::path > ("Cannot open Atffile", filename); reader r(is, dir); r.read(); @@ -336,7 +341,7 @@ impl::read_atffile(const atf::fs::path& filename) // Sanity checks. if (r.props().find("test-suite") == r.props().end()) - throw atf::not_found_error< std::string > + throw tools::not_found_error< std::string > ("Undefined property `test-suite'", "test-suite"); return atffile(r.conf(), r.tps(), r.props()); diff --git a/atf-run/atffile.hpp b/tools/atffile.hpp similarity index 82% rename from atf-run/atffile.hpp rename to tools/atffile.hpp index 8c915c24cf40..f326b241d7f0 100644 --- a/atf-run/atffile.hpp +++ b/tools/atffile.hpp @@ -27,18 +27,16 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_RUN_ATFFILE_HPP_) -#define _ATF_RUN_ATFFILE_HPP_ +#if !defined(TOOLS_ATFFILE_HPP) +#define TOOLS_ATFFILE_HPP +#include #include #include -#include "atf-c++/tests.hpp" +#include "fs.hpp" -#include "atf-c++/detail/fs.hpp" - -namespace atf { -namespace atf_run { +namespace tools { // ------------------------------------------------------------------------ // The "atf_atffile_reader" class. @@ -69,27 +67,26 @@ class atf_atffile_reader { // ------------------------------------------------------------------------ class atffile { - atf::tests::vars_map m_conf; + std::map< std::string, std::string > m_conf; std::vector< std::string > m_tps; - atf::tests::vars_map m_props; + std::map< std::string, std::string > m_props; public: - atffile(const atf::tests::vars_map&, + atffile(const std::map< std::string, std::string >&, const std::vector< std::string >&, - const atf::tests::vars_map&); + const std::map< std::string, std::string >&); - const atf::tests::vars_map& conf(void) const; + const std::map< std::string, std::string >& conf(void) const; const std::vector< std::string >& tps(void) const; - const atf::tests::vars_map& props(void) const; + const std::map< std::string, std::string >& props(void) const; }; // ------------------------------------------------------------------------ // Free functions. // ------------------------------------------------------------------------ -atffile read_atffile(const fs::path&); +atffile read_atffile(const tools::fs::path&); -} // namespace atf_run -} // namespace atf +} // namespace tools -#endif // !defined(_ATF_RUN_ATFFILE_HPP_) +#endif // !defined(TOOLS_ATFFILE_HPP) diff --git a/atf-run/atffile_test.cpp b/tools/atffile_test.cpp similarity index 95% rename from atf-run/atffile_test.cpp rename to tools/atffile_test.cpp index e5781a3370b9..cb358dfa8b9f 100644 --- a/atf-run/atffile_test.cpp +++ b/tools/atffile_test.cpp @@ -36,14 +36,13 @@ extern "C" { #include #include -#include "atf-c++/macros.hpp" - -#include "atf-c++/detail/exceptions.hpp" -#include "atf-c++/detail/test_helpers.hpp" +#include #include "atffile.hpp" +#include "exceptions.hpp" +#include "test_helpers.hpp" -namespace detail = atf::atf_run::detail; +namespace detail = tools::detail; // ------------------------------------------------------------------------ // Auxiliary functions. @@ -51,6 +50,8 @@ namespace detail = atf::atf_run::detail; namespace { +typedef std::map< std::string, std::string > vars_map; + static std::auto_ptr< std::ofstream > new_atffile(void) @@ -497,17 +498,16 @@ ATF_TEST_CASE_BODY(atffile_54) ATF_TEST_CASE(atffile_getters); ATF_TEST_CASE_HEAD(atffile_getters) {} ATF_TEST_CASE_BODY(atffile_getters) { - atf::tests::vars_map config_vars; + vars_map config_vars; config_vars["config-var-1"] = "value 1"; std::vector< std::string > test_program_names; test_program_names.push_back("test-program-1"); - atf::tests::vars_map properties; + vars_map properties; properties["test-suite"] = "a test name"; - const atf::atf_run::atffile atffile(config_vars, test_program_names, - properties); + const tools::atffile atffile(config_vars, test_program_names, properties); ATF_REQUIRE(config_vars == atffile.conf()); ATF_REQUIRE(test_program_names == atffile.tps()); ATF_REQUIRE(properties == atffile.props()); @@ -533,8 +533,8 @@ ATF_TEST_CASE_BODY(read_ok_simple) { touch_exec("tp-2"); touch_exec("tp-3"); - const atf::atf_run::atffile atffile = atf::atf_run::read_atffile( - atf::fs::path("Atffile")); + const tools::atffile atffile = tools::read_atffile( + tools::fs::path("Atffile")); ATF_REQUIRE_EQ(2, atffile.conf().size()); ATF_REQUIRE_EQ("value1", atffile.conf().find("var1")->second); ATF_REQUIRE_EQ("value2", atffile.conf().find("var2")->second); @@ -564,8 +564,8 @@ ATF_TEST_CASE_BODY(read_ok_some_globs) { touch_exec("t_hello"); touch_exec("zzzt_hello"); - const atf::atf_run::atffile atffile = atf::atf_run::read_atffile( - atf::fs::path("Atffile")); + const tools::atffile atffile = tools::read_atffile( + tools::fs::path("Atffile")); ATF_REQUIRE_EQ(5, atffile.tps().size()); ATF_REQUIRE(is_in("foo", atffile.tps())); ATF_REQUIRE(is_in("bar", atffile.tps())); @@ -580,9 +580,9 @@ ATF_TEST_CASE_BODY(read_missing_test_suite) { (*os).close(); try { - (void)atf::atf_run::read_atffile(atf::fs::path("Atffile")); + (void)tools::read_atffile(tools::fs::path("Atffile")); ATF_FAIL("Missing property 'test-suite' did not raise an error"); - } catch (const atf::not_found_error< std::string >& e) { + } catch (const tools::not_found_error< std::string >& e) { ATF_REQUIRE_EQ("test-suite", e.get_value()); } } @@ -599,9 +599,9 @@ ATF_TEST_CASE_BODY(read_missing_test_program) { touch_exec("baz"); try { - (void)atf::atf_run::read_atffile(atf::fs::path("Atffile")); + (void)tools::read_atffile(tools::fs::path("Atffile")); ATF_FAIL("Missing file 'bar' did not raise an error"); - } catch (const atf::not_found_error< atf::fs::path >& e) { + } catch (const tools::not_found_error< tools::fs::path >& e) { ATF_REQUIRE_EQ("bar", e.get_value().str()); } } diff --git a/tools/auto_array.hpp b/tools/auto_array.hpp new file mode 100644 index 000000000000..773f875524fa --- /dev/null +++ b/tools/auto_array.hpp @@ -0,0 +1,179 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if !defined(TOOLS_AUTO_ARRAY_HPP) +#define TOOLS_AUTO_ARRAY_HPP + +#include + +namespace tools { + +// ------------------------------------------------------------------------ +// The "auto_array" class. +// ------------------------------------------------------------------------ + +template< class T > +struct auto_array_ref { + T* m_ptr; + + explicit auto_array_ref(T*); +}; + +template< class T > +auto_array_ref< T >::auto_array_ref(T* ptr) : + m_ptr(ptr) +{ +} + +template< class T > +class auto_array { + T* m_ptr; + +public: + auto_array(T* = NULL) throw(); + auto_array(auto_array< T >&) throw(); + auto_array(auto_array_ref< T >) throw(); + ~auto_array(void) throw(); + + T* get(void) throw(); + const T* get(void) const throw(); + T* release(void) throw(); + void reset(T* = NULL) throw(); + + auto_array< T >& operator=(auto_array< T >&) throw(); + auto_array< T >& operator=(auto_array_ref< T >) throw(); + + T& operator[](int) throw(); + operator auto_array_ref< T >(void) throw(); +}; + +template< class T > +auto_array< T >::auto_array(T* ptr) + throw() : + m_ptr(ptr) +{ +} + +template< class T > +auto_array< T >::auto_array(auto_array< T >& ptr) + throw() : + m_ptr(ptr.release()) +{ +} + +template< class T > +auto_array< T >::auto_array(auto_array_ref< T > ref) + throw() : + m_ptr(ref.m_ptr) +{ +} + +template< class T > +auto_array< T >::~auto_array(void) + throw() +{ + if (m_ptr != NULL) + delete [] m_ptr; +} + +template< class T > +T* +auto_array< T >::get(void) + throw() +{ + return m_ptr; +} + +template< class T > +const T* +auto_array< T >::get(void) + const throw() +{ + return m_ptr; +} + +template< class T > +T* +auto_array< T >::release(void) + throw() +{ + T* ptr = m_ptr; + m_ptr = NULL; + return ptr; +} + +template< class T > +void +auto_array< T >::reset(T* ptr) + throw() +{ + if (m_ptr != NULL) + delete [] m_ptr; + m_ptr = ptr; +} + +template< class T > +auto_array< T >& +auto_array< T >::operator=(auto_array< T >& ptr) + throw() +{ + reset(ptr.release()); + return *this; +} + +template< class T > +auto_array< T >& +auto_array< T >::operator=(auto_array_ref< T > ref) + throw() +{ + if (m_ptr != ref.m_ptr) { + delete [] m_ptr; + m_ptr = ref.m_ptr; + } + return *this; +} + +template< class T > +T& +auto_array< T >::operator[](int pos) + throw() +{ + return m_ptr[pos]; +} + +template< class T > +auto_array< T >::operator auto_array_ref< T >(void) + throw() +{ + return auto_array_ref< T >(release()); +} + +} // namespace tools + +#endif // !defined(TOOLS_AUTO_ARRAY_HPP) diff --git a/tools/auto_array_test.cpp b/tools/auto_array_test.cpp new file mode 100644 index 000000000000..56bbae536003 --- /dev/null +++ b/tools/auto_array_test.cpp @@ -0,0 +1,303 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +extern "C" { +#include +} + +#include + +#include + +#include "auto_array.hpp" +#include "defs.hpp" + +// ------------------------------------------------------------------------ +// Tests for the "auto_array" class. +// ------------------------------------------------------------------------ + +class test_array { +public: + int m_value; + + static ssize_t m_nblocks; + + static + tools::auto_array< test_array > + do_copy(tools::auto_array< test_array >& ta) + { + return tools::auto_array< test_array >(ta); + } + + void* operator new(size_t size ATF_DEFS_ATTRIBUTE_UNUSED) + { + ATF_FAIL("New called but should have been new[]"); + return new int(5); + } + + void* operator new[](size_t size) + { + m_nblocks++; + void* mem = ::operator new(size); + std::cout << "Allocated 'test_array' object " << mem << "\n"; + return mem; + } + + void operator delete(void* mem ATF_DEFS_ATTRIBUTE_UNUSED) + { + ATF_FAIL("Delete called but should have been delete[]"); + } + + void operator delete[](void* mem) + { + std::cout << "Releasing 'test_array' object " << mem << "\n"; + if (m_nblocks == 0) + ATF_FAIL("Unbalanced delete[]"); + m_nblocks--; + ::operator delete(mem); + } +}; + +ssize_t test_array::m_nblocks = 0; + +ATF_TEST_CASE(auto_array_scope); +ATF_TEST_CASE_HEAD(auto_array_scope) +{ + set_md_var("descr", "Tests the automatic scope handling in the " + "auto_array smart pointer class"); +} +ATF_TEST_CASE_BODY(auto_array_scope) +{ + using tools::auto_array; + + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + { + auto_array< test_array > t(new test_array[10]); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); +} + +ATF_TEST_CASE(auto_array_copy); +ATF_TEST_CASE_HEAD(auto_array_copy) +{ + set_md_var("descr", "Tests the auto_array smart pointer class' copy " + "constructor"); +} +ATF_TEST_CASE_BODY(auto_array_copy) +{ + using tools::auto_array; + + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + { + auto_array< test_array > t1(new test_array[10]); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + + { + auto_array< test_array > t2(t1); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); +} + +ATF_TEST_CASE(auto_array_copy_ref); +ATF_TEST_CASE_HEAD(auto_array_copy_ref) +{ + set_md_var("descr", "Tests the auto_array smart pointer class' copy " + "constructor through the auxiliary auto_array_ref object"); +} +ATF_TEST_CASE_BODY(auto_array_copy_ref) +{ + using tools::auto_array; + + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + { + auto_array< test_array > t1(new test_array[10]); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + + { + auto_array< test_array > t2 = test_array::do_copy(t1); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); +} + +ATF_TEST_CASE(auto_array_get); +ATF_TEST_CASE_HEAD(auto_array_get) +{ + set_md_var("descr", "Tests the auto_array smart pointer class' get " + "method"); +} +ATF_TEST_CASE_BODY(auto_array_get) +{ + using tools::auto_array; + + test_array* ta = new test_array[10]; + auto_array< test_array > t(ta); + ATF_REQUIRE_EQ(t.get(), ta); +} + +ATF_TEST_CASE(auto_array_release); +ATF_TEST_CASE_HEAD(auto_array_release) +{ + set_md_var("descr", "Tests the auto_array smart pointer class' release " + "method"); +} +ATF_TEST_CASE_BODY(auto_array_release) +{ + using tools::auto_array; + + test_array* ta1 = new test_array[10]; + { + auto_array< test_array > t(ta1); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + test_array* ta2 = t.release(); + ATF_REQUIRE_EQ(ta2, ta1); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + delete [] ta1; +} + +ATF_TEST_CASE(auto_array_reset); +ATF_TEST_CASE_HEAD(auto_array_reset) +{ + set_md_var("descr", "Tests the auto_array smart pointer class' reset " + "method"); +} +ATF_TEST_CASE_BODY(auto_array_reset) +{ + using tools::auto_array; + + test_array* ta1 = new test_array[10]; + test_array* ta2 = new test_array[10]; + ATF_REQUIRE_EQ(test_array::m_nblocks, 2); + + { + auto_array< test_array > t(ta1); + ATF_REQUIRE_EQ(test_array::m_nblocks, 2); + t.reset(ta2); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + t.reset(); + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); +} + +ATF_TEST_CASE(auto_array_assign); +ATF_TEST_CASE_HEAD(auto_array_assign) +{ + set_md_var("descr", "Tests the auto_array smart pointer class' " + "assignment operator"); +} +ATF_TEST_CASE_BODY(auto_array_assign) +{ + using tools::auto_array; + + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + { + auto_array< test_array > t1(new test_array[10]); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + + { + auto_array< test_array > t2; + t2 = t1; + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); +} + +ATF_TEST_CASE(auto_array_assign_ref); +ATF_TEST_CASE_HEAD(auto_array_assign_ref) +{ + set_md_var("descr", "Tests the auto_array smart pointer class' " + "assignment operator through the auxiliary auto_array_ref " + "object"); +} +ATF_TEST_CASE_BODY(auto_array_assign_ref) +{ + using tools::auto_array; + + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + { + auto_array< test_array > t1(new test_array[10]); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + + { + auto_array< test_array > t2; + t2 = test_array::do_copy(t1); + ATF_REQUIRE_EQ(test_array::m_nblocks, 1); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); + } + ATF_REQUIRE_EQ(test_array::m_nblocks, 0); +} + +ATF_TEST_CASE(auto_array_access); +ATF_TEST_CASE_HEAD(auto_array_access) +{ + set_md_var("descr", "Tests the auto_array smart pointer class' access " + "operator"); +} +ATF_TEST_CASE_BODY(auto_array_access) +{ + using tools::auto_array; + + auto_array< test_array > t(new test_array[10]); + + for (int i = 0; i < 10; i++) + t[i].m_value = i * 2; + + for (int i = 0; i < 10; i++) + ATF_REQUIRE_EQ(t[i].m_value, i * 2); +} + +// ------------------------------------------------------------------------ +// Main. +// ------------------------------------------------------------------------ + +ATF_INIT_TEST_CASES(tcs) +{ + // Add the test for the "auto_array" class. + ATF_ADD_TEST_CASE(tcs, auto_array_scope); + ATF_ADD_TEST_CASE(tcs, auto_array_copy); + ATF_ADD_TEST_CASE(tcs, auto_array_copy_ref); + ATF_ADD_TEST_CASE(tcs, auto_array_get); + ATF_ADD_TEST_CASE(tcs, auto_array_release); + ATF_ADD_TEST_CASE(tcs, auto_array_reset); + ATF_ADD_TEST_CASE(tcs, auto_array_assign); + ATF_ADD_TEST_CASE(tcs, auto_array_assign_ref); + ATF_ADD_TEST_CASE(tcs, auto_array_access); +} diff --git a/atf-run/bad_metadata_helper.c b/tools/bad_metadata_helper.c similarity index 100% rename from atf-run/bad_metadata_helper.c rename to tools/bad_metadata_helper.c diff --git a/tools/config.cpp b/tools/config.cpp new file mode 100644 index 000000000000..95bcf559933b --- /dev/null +++ b/tools/config.cpp @@ -0,0 +1,135 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#include +#include + +#include "config.hpp" +#include "env.hpp" +#include "text.hpp" + +static std::map< std::string, std::string > m_variables; + +static struct var { + const char *name; + const char *default_value; + bool can_be_empty; +} vars[] = { + { "ATF_ARCH", ATF_ARCH, false, }, + { "ATF_BUILD_CC", ATF_BUILD_CC, false, }, + { "ATF_BUILD_CFLAGS", ATF_BUILD_CFLAGS, true, }, + { "ATF_BUILD_CPP", ATF_BUILD_CPP, false, }, + { "ATF_BUILD_CPPFLAGS", ATF_BUILD_CPPFLAGS, true, }, + { "ATF_BUILD_CXX", ATF_BUILD_CXX, false, }, + { "ATF_BUILD_CXXFLAGS", ATF_BUILD_CXXFLAGS, true, }, + { "ATF_CONFDIR", ATF_CONFDIR, false, }, + { "ATF_INCLUDEDIR", ATF_INCLUDEDIR, false, }, + { "ATF_LIBDIR", ATF_LIBDIR, false, }, + { "ATF_LIBEXECDIR", ATF_LIBEXECDIR, false, }, + { "ATF_MACHINE", ATF_MACHINE, false, }, + { "ATF_PKGDATADIR", ATF_PKGDATADIR, false, }, + { "ATF_SHELL", ATF_SHELL, false, }, + { "ATF_WORKDIR", ATF_WORKDIR, false, }, + { NULL, NULL, false, }, +}; + +// +// Adds all predefined standard build-time variables to the m_variables +// map, considering the values a user may have provided in the environment. +// +// Can only be called once during the program's lifetime. +// +static +void +init_variables(void) +{ + assert(m_variables.empty()); + + for (struct var* v = vars; v->name != NULL; v++) { + const std::string varname = tools::text::to_lower(v->name); + + if (tools::env::has(v->name)) { + const std::string envval = tools::env::get(v->name); + if (envval.empty() && !v->can_be_empty) + m_variables[varname] = v->default_value; + else + m_variables[varname] = envval; + } else { + m_variables[varname] = v->default_value; + } + } + + assert(!m_variables.empty()); +} + +const std::string& +tools::config::get(const std::string& varname) +{ + if (m_variables.empty()) + init_variables(); + + assert(has(varname)); + return m_variables[varname]; +} + +const std::map< std::string, std::string >& +tools::config::get_all(void) +{ + if (m_variables.empty()) + init_variables(); + + return m_variables; +} + +bool +tools::config::has(const std::string& varname) +{ + if (m_variables.empty()) + init_variables(); + + return m_variables.find(varname) != m_variables.end(); +} + +namespace tools { +namespace config { +// +// Auxiliary function for the t_config test program so that it can +// revert the configuration's global status to an empty state and +// do new tests from there on. +// +// Ideally this shouldn't be part of the production library... but +// this is so small that it does not matter. +// +void +__reinit(void) +{ + m_variables.clear(); +} +} // namespace config +} // namespace tools diff --git a/tools/config.hpp b/tools/config.hpp new file mode 100644 index 000000000000..0a43873d7ba2 --- /dev/null +++ b/tools/config.hpp @@ -0,0 +1,75 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if !defined(TOOLS_CONFIG_HPP) +#define TOOLS_CONFIG_HPP + +#include +#include + +namespace tools { + +namespace config { + +//! +//! \brief Gets a build-time configuration variable's value. +//! +//! Given the name of a build-time configuration variable, returns its +//! textual value. The user is free to override these by setting their +//! corresponding environment variables. Therefore always use this +//! interface to get the value of these variables. +//! +//! \pre The variable must exist. +//! +const std::string& get(const std::string&); + +//! +//! \brief Returns all the build-time configuration variables. +//! +//! Returns a name to value map containing all build-time configuration +//! variables. +//! +const std::map< std::string, std::string >& get_all(void); + +//! +//! \brief Checks whether a build-time configuration variable exists. +//! +//! Given the name of a build-time configuration variable, checks +//! whether it is defined and returns a boolean indicating this +//! condition. The program only has to use this function to sanity-check +//! a variable name provided by the user. Otherwise it can assume that +//! the variables are defined. +//! +bool has(const std::string&); + +} // namespace config + +} // namespace tools + +#endif // !defined(TOOLS_CONFIG_HPP) diff --git a/atf-run/config.cpp b/tools/config_file.cpp similarity index 69% rename from atf-run/config.cpp rename to tools/config_file.cpp index 0ea240fe20cd..3802c0679ed0 100644 --- a/atf-run/config.cpp +++ b/tools/config_file.cpp @@ -27,38 +27,37 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +#include #include #include -#include "atf-c/defs.h" - -#include "atf-c++/config.hpp" - -#include "atf-c++/detail/env.hpp" -#include "atf-c++/detail/fs.hpp" -#include "atf-c++/detail/sanity.hpp" -#include "atf-c++/detail/parser.hpp" - #include "config.hpp" +#include "config_file.hpp" +#include "defs.hpp" +#include "env.hpp" +#include "fs.hpp" +#include "parser.hpp" -namespace impl = atf::atf_run; -namespace detail = atf::atf_run::detail; +namespace impl = tools::config_file; +namespace detail = tools::config_file::detail; namespace { +typedef std::map< std::string, std::string > vars_map; + namespace atf_config { -static const atf::parser::token_type eof_type = 0; -static const atf::parser::token_type nl_type = 1; -static const atf::parser::token_type text_type = 2; -static const atf::parser::token_type dblquote_type = 3; -static const atf::parser::token_type equal_type = 4; -static const atf::parser::token_type hash_type = 5; +static const tools::parser::token_type eof_type = 0; +static const tools::parser::token_type nl_type = 1; +static const tools::parser::token_type text_type = 2; +static const tools::parser::token_type dblquote_type = 3; +static const tools::parser::token_type equal_type = 4; +static const tools::parser::token_type hash_type = 5; -class tokenizer : public atf::parser::tokenizer< std::istream > { +class tokenizer : public tools::parser::tokenizer< std::istream > { public: tokenizer(std::istream& is, size_t curline) : - atf::parser::tokenizer< std::istream > + tools::parser::tokenizer< std::istream > (is, true, eof_type, nl_type, text_type, curline) { add_delim('=', equal_type); @@ -70,7 +69,7 @@ class tokenizer : public atf::parser::tokenizer< std::istream > { } // namespace atf_config class config_reader : public detail::atf_config_reader { - atf::tests::vars_map m_vars; + vars_map m_vars; void got_var(const std::string& var, const std::string& name) @@ -84,7 +83,7 @@ class config_reader : public detail::atf_config_reader { { } - const atf::tests::vars_map& + const vars_map& get_vars(void) const { @@ -104,8 +103,8 @@ merge_maps(std::map< K, V >& dest, const std::map< K, V >& src) static void -merge_config_file(const atf::fs::path& config_path, - atf::tests::vars_map& config) +merge_config_file(const tools::fs::path& config_path, + vars_map& config) { std::ifstream is(config_path.c_str()); if (is) { @@ -116,13 +115,13 @@ merge_config_file(const atf::fs::path& config_path, } static -std::vector< atf::fs::path > +std::vector< tools::fs::path > get_config_dirs(void) { - std::vector< atf::fs::path > dirs; - dirs.push_back(atf::fs::path(atf::config::get("atf_confdir"))); - if (atf::env::has("HOME")) - dirs.push_back(atf::fs::path(atf::env::get("HOME")) / ".atf"); + std::vector< tools::fs::path > dirs; + dirs.push_back(tools::fs::path(tools::config::get("atf_confdir"))); + if (tools::env::has("HOME")) + dirs.push_back(tools::fs::path(tools::env::get("HOME")) / ".atf"); return dirs; } @@ -152,22 +151,22 @@ detail::atf_config_reader::got_eof(void) void detail::atf_config_reader::read(void) { - using atf::parser::parse_error; + using tools::parser::parse_error; using namespace atf_config; - std::pair< size_t, atf::parser::headers_map > hml = - atf::parser::read_headers(m_is, 1); - atf::parser::validate_content_type(hml.second, + std::pair< size_t, tools::parser::headers_map > hml = + tools::parser::read_headers(m_is, 1); + tools::parser::validate_content_type(hml.second, "application/X-atf-config", 1); tokenizer tkz(m_is, hml.first); - atf::parser::parser< tokenizer > p(tkz); + tools::parser::parser< tokenizer > p(tkz); for (;;) { try { - atf::parser::token t = p.expect(eof_type, hash_type, text_type, - nl_type, - "eof, #, new line or text"); + tools::parser::token t = p.expect(eof_type, hash_type, text_type, + nl_type, + "eof, #, new line or text"); if (t.type() == eof_type) break; @@ -189,7 +188,7 @@ detail::atf_config_reader::read(void) } } else if (t.type() == nl_type) { } else - UNREACHABLE; + std::abort(); } catch (const parse_error& pe) { p.add_error(pe); p.reset(nl_type); @@ -199,22 +198,22 @@ detail::atf_config_reader::read(void) ATF_PARSER_CALLBACK(p, got_eof()); } -atf::tests::vars_map -impl::merge_configs(const atf::tests::vars_map& lower, - const atf::tests::vars_map& upper) +vars_map +impl::merge_configs(const vars_map& lower, + const vars_map& upper) { - atf::tests::vars_map merged = lower; + vars_map merged = lower; merge_maps(merged, upper); return merged; } -atf::tests::vars_map +vars_map impl::read_config_files(const std::string& test_suite_name) { - atf::tests::vars_map config; + vars_map config; - const std::vector< atf::fs::path > dirs = get_config_dirs(); - for (std::vector< atf::fs::path >::const_iterator iter = dirs.begin(); + const std::vector< tools::fs::path > dirs = get_config_dirs(); + for (std::vector< tools::fs::path >::const_iterator iter = dirs.begin(); iter != dirs.end(); iter++) { merge_config_file((*iter) / "common.conf", config); merge_config_file((*iter) / (test_suite_name + ".conf"), config); diff --git a/atf-run/config.hpp b/tools/config_file.hpp similarity index 80% rename from atf-run/config.hpp rename to tools/config_file.hpp index 2cefec9a5fe9..0c68bcb051ac 100644 --- a/atf-run/config.hpp +++ b/tools/config_file.hpp @@ -27,13 +27,15 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +#if !defined(TOOLS_CONFIG_FILE_HPP) +#define TOOLS_CONFIG_FILE_HPP + +#include #include #include -#include "atf-c++/tests.hpp" - -namespace atf { -namespace atf_run { +namespace tools { +namespace config_file { namespace detail { @@ -53,9 +55,12 @@ class atf_config_reader { } // namespace detail -atf::tests::vars_map merge_configs(const atf::tests::vars_map&, - const atf::tests::vars_map&); -atf::tests::vars_map read_config_files(const std::string&); +std::map< std::string, std::string > merge_configs( + const std::map< std::string, std::string >&, + const std::map< std::string, std::string >&); +std::map< std::string, std::string > read_config_files(const std::string&); -} // namespace atf_run -} // namespace atf +} // namespace config_file +} // namespace tools + +#endif // !defined(TOOLS_CONFIG_FILE_HPP) diff --git a/atf-run/config_test.cpp b/tools/config_file_test.cpp similarity index 96% rename from atf-run/config_test.cpp rename to tools/config_file_test.cpp index 5b103a78acbb..b8adc7aa3469 100644 --- a/atf-run/config_test.cpp +++ b/tools/config_file_test.cpp @@ -27,17 +27,21 @@ // 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 #include "config.hpp" +#include "config_file.hpp" +#include "env.hpp" +#include "test_helpers.hpp" -namespace impl = atf::atf_run; -namespace detail = atf::atf_run::detail; +namespace impl = tools::config_file; +namespace detail = tools::config_file::detail; -using atf::tests::vars_map; +namespace { + +typedef std::map< std::string, std::string > vars_map; + +} // anonymous namespace namespace atf { namespace config { @@ -361,7 +365,7 @@ ATF_TEST_CASE_BODY(merge_configs_mixed) { 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", "."); + tools::env::set("ATF_CONFDIR", "."); atf::config::__reinit(); ATF_REQUIRE(vars_map() == impl::read_config_files("test-suite")); } diff --git a/tools/config_test.cpp b/tools/config_test.cpp new file mode 100644 index 000000000000..d7d67199b5d6 --- /dev/null +++ b/tools/config_test.cpp @@ -0,0 +1,221 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#include +#include + +#include + +#include "config.hpp" +#include "env.hpp" +#include "exceptions.hpp" + +static const char *test_value = "env-value"; + +static struct varnames { + const char *lc; + const char *uc; + bool can_be_empty; +} all_vars[] = { + { "atf_arch", "ATF_ARCH", false }, + { "atf_build_cc", "ATF_BUILD_CC", false }, + { "atf_build_cflags", "ATF_BUILD_CFLAGS", true }, + { "atf_build_cpp", "ATF_BUILD_CPP", false }, + { "atf_build_cppflags", "ATF_BUILD_CPPFLAGS", true }, + { "atf_build_cxx", "ATF_BUILD_CXX", false }, + { "atf_build_cxxflags", "ATF_BUILD_CXXFLAGS", true }, + { "atf_confdir", "ATF_CONFDIR", false }, + { "atf_includedir", "ATF_INCLUDEDIR", false }, + { "atf_libdir", "ATF_LIBDIR", false }, + { "atf_libexecdir", "ATF_LIBEXECDIR", false }, + { "atf_machine", "ATF_MACHINE", false }, + { "atf_pkgdatadir", "ATF_PKGDATADIR", false }, + { "atf_shell", "ATF_SHELL", false }, + { "atf_workdir", "ATF_WORKDIR", false }, + { NULL, NULL, false } +}; + +// ------------------------------------------------------------------------ +// Auxiliary functions. +// ------------------------------------------------------------------------ + +namespace tools { + namespace config { + void __reinit(void); + } +} + +static +void +set_env_var(const char* name, const char* val) +{ + try { + tools::env::set(name, val); + } catch (const tools::system_error&) { + ATF_FAIL(std::string("set_env_var(") + name + ", " + val + + ") failed"); + } +} + +static +void +unset_env_var(const char* name) +{ + try { + tools::env::unset(name); + } catch (const tools::system_error&) { + ATF_FAIL(std::string("unset_env_var(") + name + ") failed"); + } +} + +static +size_t +all_vars_count(void) +{ + size_t count = 0; + for (const struct varnames* v = all_vars; v->lc != NULL; v++) + count++; + return count; +} + +static +void +unset_all(void) +{ + for (const struct varnames* v = all_vars; v->lc != NULL; v++) + unset_env_var(v->uc); +} + +static +void +compare_one(const char* var, const char* expvalue) +{ + std::cout << "Checking that " << var << " is set to " << expvalue << "\n"; + + for (const struct varnames* v = all_vars; v->lc != NULL; v++) { + if (std::strcmp(v->lc, var) == 0) + ATF_REQUIRE_EQ(tools::config::get(v->lc), test_value); + else + ATF_REQUIRE(tools::config::get(v->lc) != test_value); + } +} + +// ------------------------------------------------------------------------ +// Test cases for the free functions. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(get); +ATF_TEST_CASE_HEAD(get) +{ + set_md_var("descr", "Tests the config::get function"); +} +ATF_TEST_CASE_BODY(get) +{ + // Unset all known environment variables and make sure the built-in + // values do not match the bogus value we will use for testing. + unset_all(); + tools::config::__reinit(); + for (const struct varnames* v = all_vars; v->lc != NULL; v++) + ATF_REQUIRE(tools::config::get(v->lc) != test_value); + + // Test the behavior of empty values. + for (const struct varnames* v = all_vars; v->lc != NULL; v++) { + unset_all(); + if (!tools::config::get(v->lc).empty()) { + set_env_var(v->uc, ""); + tools::config::__reinit(); + if (v->can_be_empty) + ATF_REQUIRE(tools::config::get(v->lc).empty()); + else + ATF_REQUIRE(!tools::config::get(v->lc).empty()); + } + } + + // Check if the ATF_ARCH variable is recognized. + for (const struct varnames* v = all_vars; v->lc != NULL; v++) { + unset_all(); + set_env_var(v->uc, test_value); + tools::config::__reinit(); + compare_one(v->lc, test_value); + } +} + +ATF_TEST_CASE(get_all); +ATF_TEST_CASE_HEAD(get_all) +{ + set_md_var("descr", "Tests the config::get_all function"); +} +ATF_TEST_CASE_BODY(get_all) +{ + tools::config::__reinit(); + + // Check that the valid variables, and only those, are returned. + std::map< std::string, std::string > vars = tools::config::get_all(); + ATF_REQUIRE_EQ(vars.size(), all_vars_count()); + for (const struct varnames* v = all_vars; v->lc != NULL; v++) + ATF_REQUIRE(vars.find(v->lc) != vars.end()); +} + +ATF_TEST_CASE(has); +ATF_TEST_CASE_HEAD(has) +{ + set_md_var("descr", "Tests the config::has function"); +} +ATF_TEST_CASE_BODY(has) +{ + tools::config::__reinit(); + + // Check for all the variables that must exist. + for (const struct varnames* v = all_vars; v->lc != NULL; v++) + ATF_REQUIRE(tools::config::has(v->lc)); + + // Same as above, but using uppercase (which is incorrect). + for (const struct varnames* v = all_vars; v->lc != NULL; v++) + ATF_REQUIRE(!tools::config::has(v->uc)); + + // Check for some other variables that cannot exist. + ATF_REQUIRE(!tools::config::has("foo")); + ATF_REQUIRE(!tools::config::has("BAR")); + ATF_REQUIRE(!tools::config::has("atf_foo")); + ATF_REQUIRE(!tools::config::has("ATF_BAR")); + ATF_REQUIRE(!tools::config::has("atf_shel")); + ATF_REQUIRE(!tools::config::has("atf_shells")); +} + +// ------------------------------------------------------------------------ +// Main. +// ------------------------------------------------------------------------ + +ATF_INIT_TEST_CASES(tcs) +{ + // Add the test cases for the free functions. + ATF_ADD_TEST_CASE(tcs, has); + ATF_ADD_TEST_CASE(tcs, get); + ATF_ADD_TEST_CASE(tcs, get_all); +} diff --git a/atf-report/pass_helper.cpp b/tools/defs.hpp.in similarity index 81% rename from atf-report/pass_helper.cpp rename to tools/defs.hpp.in index b752b131b387..95427951998d 100644 --- a/atf-report/pass_helper.cpp +++ b/tools/defs.hpp.in @@ -1,7 +1,7 @@ // // Automated Testing Framework (atf) // -// Copyright (c) 2007 The NetBSD Foundation, Inc. +// Copyright (c) 2008 The NetBSD Foundation, Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -27,18 +27,11 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#include "atf-c++/macros.hpp" +#if !defined(TOOLS_DEFS_HPP) +#define TOOLS_DEFS_HPP -ATF_TEST_CASE(main); -ATF_TEST_CASE_HEAD(main) -{ - set_md_var("descr", "Helper test case that always passes"); -} -ATF_TEST_CASE_BODY(main) -{ -} +#define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) @ATTRIBUTE_FORMAT_PRINTF@ +#define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@ +#define ATF_DEFS_ATTRIBUTE_UNUSED @ATTRIBUTE_UNUSED@ -ATF_INIT_TEST_CASES(tcs) -{ - ATF_ADD_TEST_CASE(tcs, main); -} +#endif /* !defined(TOOLS_DEFS_HPP) */ diff --git a/tools/env.cpp b/tools/env.cpp new file mode 100644 index 000000000000..1dbdb557bbac --- /dev/null +++ b/tools/env.cpp @@ -0,0 +1,102 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if defined(HAVE_CONFIG_H) +#include "bconfig.h" +#endif + +extern "C" { +#include +#include +#include +} + +#include + +#include "env.hpp" +#include "exceptions.hpp" + +namespace impl = tools::env; +#define IMPL_NAME "tools::env" + +// ------------------------------------------------------------------------ +// Free functions. +// ------------------------------------------------------------------------ + +std::string +impl::get(const std::string& name) +{ + const char* val = getenv(name.c_str()); + assert(val != NULL); + return val; +} + +bool +impl::has(const std::string& name) +{ + return getenv(name.c_str()) != NULL; +} + +void +impl::set(const std::string& name, const std::string& val) +{ +#if defined(HAVE_SETENV) + if (setenv(name.c_str(), val.c_str(), 1) == -1) + throw tools::system_error(IMPL_NAME "::set", + "Cannot set environment variable '" + name + + "' to '" + val + "'", + errno); +#elif defined(HAVE_PUTENV) + const std::string buf = name + "=" + val; + if (putenv(strdup(buf.c_str())) == -1) + throw tools::system_error(IMPL_NAME "::set", + "Cannot set environment variable '" + name + + "' to '" + val + "'", + errno); +#else +# error "Don't know how to set an environment variable." +#endif +} + +void +impl::unset(const std::string& name) +{ +#if defined(HAVE_UNSETENV) + unsetenv(name.c_str()); +#elif defined(HAVE_PUTENV) + const std::string buf = name + "="; + + if (putenv(strdup(buf.c_str())) == -1) + throw tools::system_error(IMPL_NAME "::unset", + "Cannot unset environment variable '" + + name + "'", errno); +#else +# error "Don't know how to unset an environment variable." +#endif +} diff --git a/tools/env.hpp b/tools/env.hpp new file mode 100644 index 000000000000..f87a58f92f8d --- /dev/null +++ b/tools/env.hpp @@ -0,0 +1,84 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if !defined(TOOLS_ENV_HPP) +#define TOOLS_ENV_HPP + +#include + +namespace tools { +namespace env { + +// ------------------------------------------------------------------------ +// Free functions. +// ------------------------------------------------------------------------ + +//! +//! \brief Returns the value of an environment variable. +//! +//! Returns the value of the specified environment variable. The variable +//! must be defined. +//! +std::string get(const std::string&); + +//! +//! \brief Checks if the environment has a variable. +//! +//! Checks if the environment has a given variable. +//! +bool has(const std::string&); + +//! +//! \brief Sets an environment variable to a given value. +//! +//! Sets the specified environment variable to the given value. Note that +//! variables set to the empty string are different to undefined ones. +//! +//! Be aware that this alters the program's global status, which in general +//! is a bad thing to do due to the side-effects it may have. There are +//! some legitimate usages for this function, though. +//! +void set(const std::string&, const std::string&); + +//! +//! \brief Unsets an environment variable. +//! +//! Unsets the specified environment variable Note that undefined +//! variables are different to those defined but set to an empty value. +//! +//! Be aware that this alters the program's global status, which in general +//! is a bad thing to do due to the side-effects it may have. There are +//! some legitimate usages for this function, though. +//! +void unset(const std::string&); + +} // namespace env +} // namespace tools + +#endif // !defined(TOOLS_ENV_HPP) diff --git a/atf-report/misc_helpers.cpp b/tools/env_test.cpp similarity index 57% rename from atf-report/misc_helpers.cpp rename to tools/env_test.cpp index 6f14ce4cf1ce..441a16ff8952 100644 --- a/atf-report/misc_helpers.cpp +++ b/tools/env_test.cpp @@ -27,34 +27,55 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#include +#include -#include "atf-c++/macros.hpp" +#include "env.hpp" // ------------------------------------------------------------------------ -// Helper tests for "t_integration". +// Test cases for the free functions. // ------------------------------------------------------------------------ -ATF_TEST_CASE(diff); -ATF_TEST_CASE_HEAD(diff) +ATF_TEST_CASE(has_get); +ATF_TEST_CASE_HEAD(has_get) { - set_md_var("descr", "Helper test case for the t_integration program"); + set_md_var("descr", "Tests the has and get functions"); } -ATF_TEST_CASE_BODY(diff) +ATF_TEST_CASE_BODY(has_get) { - std::cout << "--- a 2007-11-04 14:00:41.000000000 +0100\n"; - std::cout << "+++ b 2007-11-04 14:00:48.000000000 +0100\n"; - std::cout << "@@ -1,7 +1,7 @@\n"; - std::cout << " This test is meant to simulate a diff.\n"; - std::cout << " Blank space at beginning of context lines must be " - "preserved.\n"; - std::cout << " \n"; - std::cout << "-First original line.\n"; - std::cout << "-Second original line.\n"; - std::cout << "+First modified line.\n"; - std::cout << "+Second modified line.\n"; - std::cout << " \n"; - std::cout << " EOF\n"; + ATF_REQUIRE(tools::env::has("PATH")); + ATF_REQUIRE(!tools::env::get("PATH").empty()); + + ATF_REQUIRE(!tools::env::has("_UNDEFINED_VARIABLE_")); +} + +ATF_TEST_CASE(set); +ATF_TEST_CASE_HEAD(set) +{ + set_md_var("descr", "Tests the set function"); +} +ATF_TEST_CASE_BODY(set) +{ + ATF_REQUIRE(tools::env::has("PATH")); + const std::string& oldval = tools::env::get("PATH"); + tools::env::set("PATH", "foo-bar"); + ATF_REQUIRE(tools::env::get("PATH") != oldval); + ATF_REQUIRE_EQ(tools::env::get("PATH"), "foo-bar"); + + ATF_REQUIRE(!tools::env::has("_UNDEFINED_VARIABLE_")); + tools::env::set("_UNDEFINED_VARIABLE_", "foo2-bar2"); + ATF_REQUIRE_EQ(tools::env::get("_UNDEFINED_VARIABLE_"), "foo2-bar2"); +} + +ATF_TEST_CASE(unset); +ATF_TEST_CASE_HEAD(unset) +{ + set_md_var("descr", "Tests the unset function"); +} +ATF_TEST_CASE_BODY(unset) +{ + ATF_REQUIRE(tools::env::has("PATH")); + tools::env::unset("PATH"); + ATF_REQUIRE(!tools::env::has("PATH")); } // ------------------------------------------------------------------------ @@ -63,6 +84,8 @@ ATF_TEST_CASE_BODY(diff) ATF_INIT_TEST_CASES(tcs) { - // Add helper tests for t_integration. - ATF_ADD_TEST_CASE(tcs, diff); + // Add the test cases for the free functions. + ATF_ADD_TEST_CASE(tcs, has_get); + ATF_ADD_TEST_CASE(tcs, set); + ATF_ADD_TEST_CASE(tcs, unset); } diff --git a/atf-c++/noncopyable.hpp b/tools/exceptions.cpp similarity index 65% rename from atf-c++/noncopyable.hpp rename to tools/exceptions.cpp index a885a668cb12..8587121cefa2 100644 --- a/atf-c++/noncopyable.hpp +++ b/tools/exceptions.cpp @@ -27,30 +27,48 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_CXX_NONCOPYABLE_HPP_) -#define _ATF_CXX_NONCOPYABLE_HPP_ +#include -namespace atf { +#include "exceptions.hpp" // ------------------------------------------------------------------------ -// The "noncopyable" class. +// The "system_error" type. // ------------------------------------------------------------------------ -class noncopyable { - // The class cannot be empty; otherwise we get ABI-stability warnings - // during the build, which will break it due to strict checking. - int m_noncopyable_dummy; +tools::system_error::system_error(const std::string& who, + const std::string& message, + int sys_err) : + std::runtime_error(who + ": " + message), + m_sys_err(sys_err) +{ +} - noncopyable(const noncopyable& nc); - noncopyable& operator=(const noncopyable& nc); +tools::system_error::~system_error(void) + throw() +{ +} -protected: - // Explicitly needed to provide some non-private functions. Otherwise - // we also get some warnings during the build. - noncopyable(void) {} - ~noncopyable(void) {} -}; +int +tools::system_error::code(void) + const + throw() +{ + return m_sys_err; +} -} // namespace atf +const char* +tools::system_error::what(void) + const + throw() +{ + try { + if (m_message.length() == 0) { + m_message = std::string(std::runtime_error::what()) + ": "; + m_message += ::strerror(m_sys_err); + } -#endif // !defined(_ATF_CXX_NONCOPYABLE_HPP_) + return m_message.c_str(); + } catch (...) { + return "Unable to format system_error message"; + } +} diff --git a/atf-run/fs.hpp b/tools/exceptions.hpp similarity index 55% rename from atf-run/fs.hpp rename to tools/exceptions.hpp index 37382684b57b..4346b7b54fb9 100644 --- a/atf-run/fs.hpp +++ b/tools/exceptions.hpp @@ -27,31 +27,67 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_RUN_FS_HPP_) -#define _ATF_RUN_FS_HPP_ +#if !defined(TOOLS_EXCEPTIONS_HPP) +#define TOOLS_EXCEPTIONS_HPP -#include +#include +#include -#include "atf-c++/detail/fs.hpp" +namespace tools { -namespace atf { -namespace atf_run { - -class temp_dir { - std::auto_ptr< atf::fs::path > m_path; +template< class T > +class not_found_error : + public std::runtime_error +{ + T m_value; public: - temp_dir(const atf::fs::path&); - ~temp_dir(void); + not_found_error(const std::string& message, const T& value) throw(); - const atf::fs::path& get_path(void) const; + virtual ~not_found_error(void) throw(); + + const T& get_value(void) const throw(); }; -atf::fs::path change_directory(const atf::fs::path&); -void cleanup(const atf::fs::path&); -atf::fs::path get_current_dir(void); +template< class T > +inline +not_found_error< T >::not_found_error(const std::string& message, + const T& value) + throw() : + std::runtime_error(message), + m_value(value) +{ +} -} // namespace atf_run -} // namespace atf +template< class T > +inline +not_found_error< T >::~not_found_error(void) + throw() +{ +} -#endif // !defined(_ATF_RUN_FS_HPP_) +template< class T > +inline +const T& +not_found_error< T >::get_value(void) + const + throw() +{ + return m_value; +} + +class system_error : public std::runtime_error { + int m_sys_err; + mutable std::string m_message; + +public: + system_error(const std::string&, const std::string&, int); + ~system_error(void) throw(); + + int code(void) const throw(); + const char* what(void) const throw(); +}; + +} // namespace tools + +#endif // !defined(TOOLS_EXCEPTIONS_HPP) diff --git a/atf-c++/detail/expand.cpp b/tools/expand.cpp similarity index 95% rename from atf-c++/detail/expand.cpp rename to tools/expand.cpp index f6f9b6882ec6..3ae27d05e55f 100644 --- a/atf-c++/detail/expand.cpp +++ b/tools/expand.cpp @@ -32,8 +32,8 @@ #include "expand.hpp" #include "text.hpp" -namespace impl = atf::expand; -#define IMPL_NAME "atf::expand" +namespace impl = tools::expand; +#define IMPL_NAME "tools::expand" // ------------------------------------------------------------------------ // Auxiliary functions. @@ -77,5 +77,5 @@ impl::is_glob(const std::string& glob) bool impl::matches_glob(const std::string& glob, const std::string& candidate) { - return atf::text::match(candidate, glob_to_regex(glob)); + return tools::text::match(candidate, glob_to_regex(glob)); } diff --git a/atf-c++/detail/expand.hpp b/tools/expand.hpp similarity index 95% rename from atf-c++/detail/expand.hpp rename to tools/expand.hpp index 7f4071ee8472..b8135445af04 100644 --- a/atf-c++/detail/expand.hpp +++ b/tools/expand.hpp @@ -27,13 +27,13 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_CXX_EXPAND_HPP_) -#define _ATF_CXX_EXPAND_HPP_ +#if !defined(TOOLS_EXPAND_HPP) +#define TOOLS_EXPAND_HPP #include #include -namespace atf { +namespace tools { namespace expand { // ------------------------------------------------------------------------ @@ -77,6 +77,6 @@ std::vector< std::string > expand_glob(const std::string& glob, } } // namespace expand -} // namespace atf +} // namespace tools -#endif // !defined(_ATF_CXX_EXPAND_HPP_) +#endif // !defined(TOOLS_EXPAND_HPP) diff --git a/atf-c++/detail/expand_test.cpp b/tools/expand_test.cpp similarity index 97% rename from atf-c++/detail/expand_test.cpp rename to tools/expand_test.cpp index 222ab3a92c29..fb59de8db2ae 100644 --- a/atf-c++/detail/expand_test.cpp +++ b/tools/expand_test.cpp @@ -29,7 +29,7 @@ #include -#include "../macros.hpp" +#include #include "expand.hpp" @@ -47,7 +47,7 @@ ATF_TEST_CASE_HEAD(is_glob) } ATF_TEST_CASE_BODY(is_glob) { - using atf::expand::is_glob; + using tools::expand::is_glob; ATF_REQUIRE(!is_glob("")); ATF_REQUIRE(!is_glob("a")); @@ -72,7 +72,7 @@ ATF_TEST_CASE_HEAD(matches_glob_plain) } ATF_TEST_CASE_BODY(matches_glob_plain) { - using atf::expand::matches_glob; + using tools::expand::matches_glob; ATF_REQUIRE( matches_glob("", "")); ATF_REQUIRE(!matches_glob("a", "")); @@ -91,7 +91,7 @@ ATF_TEST_CASE_HEAD(matches_glob_star) } ATF_TEST_CASE_BODY(matches_glob_star) { - using atf::expand::matches_glob; + using tools::expand::matches_glob; ATF_REQUIRE( matches_glob("*", "")); ATF_REQUIRE( matches_glob("*", "a")); @@ -131,7 +131,7 @@ ATF_TEST_CASE_HEAD(matches_glob_question) } ATF_TEST_CASE_BODY(matches_glob_question) { - using atf::expand::matches_glob; + using tools::expand::matches_glob; ATF_REQUIRE(!matches_glob("?", "")); ATF_REQUIRE( matches_glob("?", "a")); @@ -159,7 +159,7 @@ ATF_TEST_CASE_HEAD(expand_glob_base) } ATF_TEST_CASE_BODY(expand_glob_base) { - using atf::expand::expand_glob; + using tools::expand::expand_glob; std::vector< std::string > candidates; candidates.push_back("foo"); @@ -228,7 +228,7 @@ ATF_TEST_CASE_HEAD(expand_glob_tps) } ATF_TEST_CASE_BODY(expand_glob_tps) { - using atf::expand::expand_glob; + using tools::expand::expand_glob; std::vector< std::string > candidates; candidates.push_back("Atffile"); diff --git a/atf-run/expect_helpers.c b/tools/expect_helpers.c similarity index 100% rename from atf-run/expect_helpers.c rename to tools/expect_helpers.c diff --git a/atf-report/fail_helper.cpp b/tools/fail_helper.cpp similarity index 98% rename from atf-report/fail_helper.cpp rename to tools/fail_helper.cpp index 1009f0e47961..736b5e8be08e 100644 --- a/atf-report/fail_helper.cpp +++ b/tools/fail_helper.cpp @@ -27,7 +27,7 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#include "atf-c++/macros.hpp" +#include ATF_TEST_CASE(main); ATF_TEST_CASE_HEAD(main) diff --git a/tools/fs.cpp b/tools/fs.cpp new file mode 100644 index 000000000000..fde78150284f --- /dev/null +++ b/tools/fs.cpp @@ -0,0 +1,744 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if defined(HAVE_CONFIG_H) +#include "bconfig.h" +#endif + +extern "C" { +#include +#include +#include +#include +#include + +#include +#include +#include +} + +#include +#include +#include +#include + +#include "auto_array.hpp" +#include "env.hpp" +#include "exceptions.hpp" +#include "fs.hpp" +#include "process.hpp" +#include "text.hpp" +#include "user.hpp" + +namespace impl = tools::fs; +#define IMPL_NAME "tools::fs" + +// ------------------------------------------------------------------------ +// Auxiliary functions. +// ------------------------------------------------------------------------ + +static void cleanup_aux(const impl::path&, dev_t, bool); +static void cleanup_aux_dir(const impl::path&, const impl::file_info&, + bool); +static void do_unmount(const impl::path&); +static bool safe_access(const impl::path&, int, int); + +static const int access_f = 1 << 0; +static const int access_r = 1 << 1; +static const int access_w = 1 << 2; +static const int access_x = 1 << 3; + +//! +//! An implementation of access(2) but using the effective user value +//! instead of the real one. Also avoids false positives for root when +//! asking for execute permissions, which appear in SunOS. +//! +static +void +eaccess(const tools::fs::path& p, int mode) +{ + assert(mode & access_f || mode & access_r || + mode & access_w || mode & access_x); + + struct stat st; + if (lstat(p.c_str(), &st) == -1) + throw tools::system_error(IMPL_NAME "::eaccess", + "Cannot get information from file " + + p.str(), errno); + + /* Early return if we are only checking for existence and the file + * exists (stat call returned). */ + if (mode & access_f) + return; + + bool ok = false; + if (tools::user::is_root()) { + if (!ok && !(mode & access_x)) { + /* Allow root to read/write any file. */ + ok = true; + } + + if (!ok && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) { + /* Allow root to execute the file if any of its execution bits + * are set. */ + ok = true; + } + } else { + if (!ok && (tools::user::euid() == st.st_uid)) { + ok = ((mode & access_r) && (st.st_mode & S_IRUSR)) || + ((mode & access_w) && (st.st_mode & S_IWUSR)) || + ((mode & access_x) && (st.st_mode & S_IXUSR)); + } + if (!ok && tools::user::is_member_of_group(st.st_gid)) { + ok = ((mode & access_r) && (st.st_mode & S_IRGRP)) || + ((mode & access_w) && (st.st_mode & S_IWGRP)) || + ((mode & access_x) && (st.st_mode & S_IXGRP)); + } + if (!ok && ((tools::user::euid() != st.st_uid) && + !tools::user::is_member_of_group(st.st_gid))) { + ok = ((mode & access_r) && (st.st_mode & S_IROTH)) || + ((mode & access_w) && (st.st_mode & S_IWOTH)) || + ((mode & access_x) && (st.st_mode & S_IXOTH)); + } + } + + if (!ok) + throw tools::system_error(IMPL_NAME "::eaccess", "Access check failed", + EACCES); +} + +//! +//! \brief A controlled version of access(2). +//! +//! This function reimplements the standard access(2) system call to +//! safely control its exit status and raise an exception in case of +//! failure. +//! +static +bool +safe_access(const impl::path& p, int mode, int experr) +{ + try { + eaccess(p, mode); + return true; + } catch (const tools::system_error& e) { + if (e.code() == experr) + return false; + else + throw e; + } +} + +// The cleanup routines below are tricky: they are executed immediately after +// a test case's death, and after we have forcibly killed any stale processes. +// However, even if the processes are dead, this does not mean that the file +// system we are scanning is stable. In particular, if the test case has +// mounted file systems through fuse/puffs, the fact that the processes died +// does not mean that the file system is truly unmounted. +// +// The code below attempts to cope with this by catching errors and either +// ignoring them or retrying the actions on the same file/directory a few times +// before giving up. +static const int max_retries = 5; +static const int retry_delay_in_seconds = 1; + +// The erase parameter in this routine is to control nested mount points. +// We want to descend into a mount point to unmount anything that is +// mounted under it, but we do not want to delete any files while doing +// this traversal. In other words, we erase files until we cross the +// first mount point, and after that point we only scan and unmount. +static +void +cleanup_aux(const impl::path& p, dev_t parent_device, bool erase) +{ + try { + impl::file_info fi(p); + + if (fi.get_type() == impl::file_info::dir_type) + cleanup_aux_dir(p, fi, fi.get_device() == parent_device); + + if (fi.get_device() != parent_device) + do_unmount(p); + + if (erase) { + if (fi.get_type() == impl::file_info::dir_type) + impl::rmdir(p); + else + impl::remove(p); + } + } catch (const tools::system_error& e) { + if (e.code() != ENOENT && e.code() != ENOTDIR) + throw e; + } +} + +static +void +cleanup_aux_dir(const impl::path& p, const impl::file_info& fi, + bool erase) +{ + if (erase && ((fi.get_mode() & S_IRWXU) != S_IRWXU)) { + int retries = max_retries; +retry_chmod: + if (chmod(p.c_str(), fi.get_mode() | S_IRWXU) == -1) { + if (retries > 0) { + retries--; + ::sleep(retry_delay_in_seconds); + goto retry_chmod; + } else { + throw tools::system_error(IMPL_NAME "::cleanup(" + + p.str() + ")", "chmod(2) failed", + errno); + } + } + } + + std::set< std::string > subdirs; + { + bool ok = false; + int retries = max_retries; + while (!ok) { + assert(retries > 0); + try { + const impl::directory d(p); + subdirs = d.names(); + ok = true; + } catch (const tools::system_error& e) { + retries--; + if (retries == 0) + throw e; + ::sleep(retry_delay_in_seconds); + } + } + assert(ok); + } + + for (std::set< std::string >::const_iterator iter = subdirs.begin(); + iter != subdirs.end(); iter++) { + const std::string& name = *iter; + if (name != "." && name != "..") + cleanup_aux(p / name, fi.get_device(), erase); + } +} + +static +void +do_unmount(const impl::path& in_path) +{ + // At least, FreeBSD's unmount(2) requires the path to be absolute. + // Let's make it absolute in all cases just to be safe that this does + // not affect other systems. + const impl::path& abs_path = in_path.is_absolute() ? + in_path : in_path.to_absolute(); + +#if defined(HAVE_UNMOUNT) + int retries = max_retries; +retry_unmount: + if (unmount(abs_path.c_str(), 0) == -1) { + if (errno == EBUSY && retries > 0) { + retries--; + ::sleep(retry_delay_in_seconds); + goto retry_unmount; + } else { + throw tools::system_error(IMPL_NAME "::cleanup(" + in_path.str() + + ")", "unmount(2) failed", errno); + } + } +#else + // We could use umount(2) instead if it was available... but + // trying to do so under, e.g. Linux, is a nightmare because we + // also have to update /etc/mtab to match what we did. It is + // stools::fser to just leave the system-specific umount(8) tool deal + // with it, at least for now. + + const impl::path prog("umount"); + tools::process::argv_array argv("umount", abs_path.c_str(), NULL); + + tools::process::status s = tools::process::exec(prog, argv, + tools::process::stream_inherit(), tools::process::stream_inherit()); + if (!s.exited() || s.exitstatus() != EXIT_SUCCESS) + throw std::runtime_error("Call to unmount failed"); +#endif +} + +static +std::string +normalize(const std::string& in) +{ + assert(!in.empty()); + + std::string out; + + std::string::size_type pos = 0; + do { + const std::string::size_type next_pos = in.find('/', pos); + + const std::string component = in.substr(pos, next_pos - pos); + if (!component.empty()) { + if (pos == 0) + out += component; + else if (component != ".") + out += "/" + component; + } + + if (next_pos == std::string::npos) + pos = next_pos; + else + pos = next_pos + 1; + } while (pos != std::string::npos); + + return out.empty() ? "/" : out; +} + +// ------------------------------------------------------------------------ +// The "path" class. +// ------------------------------------------------------------------------ + +impl::path::path(const std::string& s) : + m_data(normalize(s)) +{ +} + +impl::path::~path(void) +{ +} + +const char* +impl::path::c_str(void) + const +{ + return m_data.c_str(); +} + +std::string +impl::path::str(void) + const +{ + return m_data; +} + +bool +impl::path::is_absolute(void) + const +{ + return !m_data.empty() && m_data[0] == '/'; +} + +bool +impl::path::is_root(void) + const +{ + return m_data == "/"; +} + +impl::path +impl::path::branch_path(void) + const +{ + const std::string::size_type endpos = m_data.rfind('/'); + if (endpos == std::string::npos) + return path("."); + else if (endpos == 0) + return path("/"); + else + return path(m_data.substr(0, endpos)); +} + +std::string +impl::path::leaf_name(void) + const +{ + std::string::size_type begpos = m_data.rfind('/'); + if (begpos == std::string::npos) + begpos = 0; + else + begpos++; + + return m_data.substr(begpos); +} + +impl::path +impl::path::to_absolute(void) + const +{ + assert(!is_absolute()); + return get_current_dir() / m_data; +} + +bool +impl::path::operator==(const path& p) + const +{ + return m_data == p.m_data; +} + +bool +impl::path::operator!=(const path& p) + const +{ + return m_data != p.m_data; +} + +impl::path +impl::path::operator/(const std::string& p) + const +{ + return path(m_data + "/" + normalize(p)); +} + +impl::path +impl::path::operator/(const path& p) + const +{ + return path(m_data) / p.m_data; +} + +bool +impl::path::operator<(const path& p) + const +{ + return std::strcmp(m_data.c_str(), p.m_data.c_str()) < 0; +} + +// ------------------------------------------------------------------------ +// The "file_info" class. +// ------------------------------------------------------------------------ + +const int impl::file_info::blk_type = 1; +const int impl::file_info::chr_type = 2; +const int impl::file_info::dir_type = 3; +const int impl::file_info::fifo_type = 4; +const int impl::file_info::lnk_type = 5; +const int impl::file_info::reg_type = 6; +const int impl::file_info::sock_type = 7; +const int impl::file_info::wht_type = 8; + +impl::file_info::file_info(const path& p) +{ + if (lstat(p.c_str(), &m_sb) == -1) + throw system_error(IMPL_NAME "::file_info", + "Cannot get information of " + p.str() + "; " + + "lstat(2) failed", errno); + + int type = m_sb.st_mode & S_IFMT; + switch (type) { + case S_IFBLK: m_type = blk_type; break; + case S_IFCHR: m_type = chr_type; break; + case S_IFDIR: m_type = dir_type; break; + case S_IFIFO: m_type = fifo_type; break; + 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); + } +} + +impl::file_info::~file_info(void) +{ +} + +dev_t +impl::file_info::get_device(void) + const +{ + return m_sb.st_dev; +} + +ino_t +impl::file_info::get_inode(void) + const +{ + return m_sb.st_ino; +} + +mode_t +impl::file_info::get_mode(void) + const +{ + return m_sb.st_mode & ~S_IFMT; +} + +off_t +impl::file_info::get_size(void) + const +{ + return m_sb.st_size; +} + +int +impl::file_info::get_type(void) + const +{ + return m_type; +} + +bool +impl::file_info::is_owner_readable(void) + const +{ + return m_sb.st_mode & S_IRUSR; +} + +bool +impl::file_info::is_owner_writable(void) + const +{ + return m_sb.st_mode & S_IWUSR; +} + +bool +impl::file_info::is_owner_executable(void) + const +{ + return m_sb.st_mode & S_IXUSR; +} + +bool +impl::file_info::is_group_readable(void) + const +{ + return m_sb.st_mode & S_IRGRP; +} + +bool +impl::file_info::is_group_writable(void) + const +{ + return m_sb.st_mode & S_IWGRP; +} + +bool +impl::file_info::is_group_executable(void) + const +{ + return m_sb.st_mode & S_IXGRP; +} + +bool +impl::file_info::is_other_readable(void) + const +{ + return m_sb.st_mode & S_IROTH; +} + +bool +impl::file_info::is_other_writable(void) + const +{ + return m_sb.st_mode & S_IWOTH; +} + +bool +impl::file_info::is_other_executable(void) + const +{ + return m_sb.st_mode & S_IXOTH; +} + +// ------------------------------------------------------------------------ +// The "directory" class. +// ------------------------------------------------------------------------ + +impl::directory::directory(const path& p) +{ + DIR* dp = ::opendir(p.c_str()); + if (dp == NULL) + throw system_error(IMPL_NAME "::directory::directory(" + + p.str() + ")", "opendir(3) failed", errno); + + struct dirent* dep; + while ((dep = ::readdir(dp)) != NULL) { + path entryp = p / dep->d_name; + insert(value_type(dep->d_name, file_info(entryp))); + } + + if (::closedir(dp) == -1) + throw system_error(IMPL_NAME "::directory::directory(" + + p.str() + ")", "closedir(3) failed", errno); +} + +std::set< std::string > +impl::directory::names(void) + const +{ + std::set< std::string > ns; + + for (const_iterator iter = begin(); iter != end(); iter++) + ns.insert((*iter).first); + + return ns; +} + +// ------------------------------------------------------------------------ +// The "temp_dir" class. +// ------------------------------------------------------------------------ + +impl::temp_dir::temp_dir(const path& p) +{ + tools::auto_array< char > buf(new char[p.str().length() + 1]); + std::strcpy(buf.get(), p.c_str()); + if (::mkdtemp(buf.get()) == NULL) + throw tools::system_error(IMPL_NAME "::temp_dir::temp_dir(" + + p.str() + ")", "mkdtemp(3) failed", + errno); + + m_path.reset(new path(buf.get())); +} + +impl::temp_dir::~temp_dir(void) +{ + cleanup(*m_path); +} + +const impl::path& +impl::temp_dir::get_path(void) + const +{ + return *m_path; +} + +// ------------------------------------------------------------------------ +// Free functions. +// ------------------------------------------------------------------------ + +bool +impl::exists(const path& p) +{ + try { + eaccess(p, access_f); + return true; + } catch (const system_error& e) { + if (e.code() == ENOENT) + return false; + else + throw; + } +} + +bool +impl::have_prog_in_path(const std::string& prog) +{ + assert(prog.find('/') == std::string::npos); + + // Do not bother to provide a default value for PATH. If it is not + // there something is broken in the user's environment. + if (!tools::env::has("PATH")) + throw std::runtime_error("PATH not defined in the environment"); + std::vector< std::string > dirs = + tools::text::split(tools::env::get("PATH"), ":"); + + bool found = false; + for (std::vector< std::string >::const_iterator iter = dirs.begin(); + !found && iter != dirs.end(); iter++) { + const path& dir = path(*iter); + + if (is_executable(dir / prog)) + found = true; + } + return found; +} + +bool +impl::is_executable(const path& p) +{ + if (!exists(p)) + return false; + return safe_access(p, access_x, EACCES); +} + +void +impl::remove(const path& p) +{ + if (file_info(p).get_type() == file_info::dir_type) + throw tools::system_error(IMPL_NAME "::remove(" + p.str() + ")", + "Is a directory", + EPERM); + if (::unlink(p.c_str()) == -1) + throw tools::system_error(IMPL_NAME "::remove(" + p.str() + ")", + "unlink(" + p.str() + ") failed", + errno); +} + +void +impl::rmdir(const path& p) +{ + if (::rmdir(p.c_str())) { + if (errno == EEXIST) { + /* Some operating systems (e.g. OpenSolaris 200906) return + * EEXIST instead of ENOTEMPTY for non-empty directories. + * Homogenize the return value so that callers don't need + * to bother about differences in operating systems. */ + errno = ENOTEMPTY; + } + throw system_error(IMPL_NAME "::rmdir", "Cannot remove directory", + errno); + } +} + +impl::path +impl::change_directory(const path& dir) +{ + path olddir = get_current_dir(); + + if (olddir != dir) { + if (::chdir(dir.c_str()) == -1) + throw tools::system_error(IMPL_NAME "::chdir(" + dir.str() + ")", + "chdir(2) failed", errno); + } + + return olddir; +} + +void +impl::cleanup(const path& p) +{ + impl::file_info fi(p); + cleanup_aux(p, fi.get_device(), true); +} + +impl::path +impl::get_current_dir(void) +{ + std::auto_ptr< char > cwd; +#if defined(HAVE_GETCWD_DYN) + cwd.reset(getcwd(NULL, 0)); +#else + cwd.reset(getcwd(NULL, MAXPATHLEN)); +#endif + if (cwd.get() == NULL) + throw tools::system_error(IMPL_NAME "::get_current_dir()", + "getcwd() failed", errno); + + return path(cwd.get()); +} diff --git a/tools/fs.hpp b/tools/fs.hpp new file mode 100644 index 000000000000..f45f8f1f272d --- /dev/null +++ b/tools/fs.hpp @@ -0,0 +1,377 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if !defined(TOOLS_FS_HPP) +#define TOOLS_FS_HPP + +extern "C" { +#include +#include +} + +#include +#include +#include +#include +#include +#include + +namespace tools { +namespace fs { + +// ------------------------------------------------------------------------ +// The "path" class. +// ------------------------------------------------------------------------ + +//! +//! \brief A class to represent a path to a file. +//! +//! The path class represents the route to a file or directory in the +//! file system. All file manipulation operations use this class to +//! represent their arguments as it takes care of normalizing user-provided +//! strings and ensures they are valid. +//! +//! It is important to note that the file pointed to by a path need not +//! exist. +//! +class path { + //! + //! \brief Internal representation of a path. + //! + std::string m_data; + +public: + //! \brief Constructs a new path from a user-provided string. + //! + //! This constructor takes a string, either provided by the program's + //! code or by the user and constructs a new path object. The string + //! is normalized to not contain multiple delimiters together and to + //! remove any trailing one. + //! + //! The input string cannot be empty. + //! + explicit path(const std::string&); + + //! + //! \brief Destructor for the path class. + //! + ~path(void); + + //! + //! \brief Returns a pointer to a C-style string representing this path. + //! + const char* c_str(void) const; + + //! + //! \brief Returns a string representing this path. + //! XXX Really needed? + //! + std::string str(void) const; + + //! + //! \brief Returns the branch path of this path. + //! + //! Calculates and returns the branch path of this path. In other + //! words, it returns what the standard ::dirname function would return. + //! + path branch_path(void) const; + + //! + //! \brief Returns the leaf name of this path. + //! + //! Calculates and returns the leaf name of this path. In other words, + //! it returns what the standard ::basename function would return. + //! + std::string leaf_name(void) const; + + //! + //! \brief Checks whether this path is absolute or not. + //! + //! Returns a boolean indicating if this is an absolute path or not; + //! i.e. if it starts with a slash. + //! + bool is_absolute(void) const; + + //! + //! \brief Checks whether this path points to the root directory or not. + //! + //! Returns a boolean indicating if this is path points to the root + //! directory or not. The checks made by this are extremely simple (so + //! the results cannot always be trusted) but they are enough for our + //! modest sanity-checking needs. I.e. "/../" could return false. + //! + bool is_root(void) const; + + //! + //! \brief Converts the path to be absolute. + //! + //! \pre The path was not absolute. + //! + path to_absolute(void) const; + + //! + //! \brief Checks if two paths are equal. + //! + bool operator==(const path&) const; + + //! + //! \brief Checks if two paths are different. + //! + bool operator!=(const path&) const; + + //! + //! \brief Concatenates a path with a string. + //! + //! Constructs a new path object that is the concatenation of the + //! left-hand path with the right-hand string. The string is normalized + //! before the concatenation, and a path delimiter is introduced between + //! the two components if needed. + //! + path operator/(const std::string&) const; + + //! + //! \brief Concatenates a path with another path. + //! + //! Constructs a new path object that is the concatenation of the + //! left-hand path with the right-hand one. A path delimiter is + //! introduced between the two components if needed. + //! + path operator/(const path&) const; + + //! + //! \brief Checks if a path has to be sorted before another one + //! lexicographically. + //! + bool operator<(const path&) const; +}; + +// ------------------------------------------------------------------------ +// The "file_info" class. +// ------------------------------------------------------------------------ + +class directory; + +//! +//! \brief A class that contains information about a file. +//! +//! The file_info class holds information about an specific file that +//! exists in the file system. +//! +class file_info { + int m_type; + struct stat m_sb; + +public: + //! + //! \brief The file's type. + //! + static const int blk_type; + static const int chr_type; + static const int dir_type; + static const int fifo_type; + static const int lnk_type; + static const int reg_type; + static const int sock_type; + static const int wht_type; + + //! + //! \brief Constructs a new file_info based on a given file. + //! + //! This constructor creates a new file_info object and fills it with + //! the data returned by ::stat when run on the given file, which must + //! exist. + //! + explicit file_info(const path&); + + //! + //! \brief The destructor. + //! + ~file_info(void); + + //! + //! \brief Returns the device containing the file. + //! + dev_t get_device(void) const; + + //! + //! \brief Returns the file's inode. + //! + ino_t get_inode(void) const; + + //! + //! \brief Returns the file's permissions. + //! + mode_t get_mode(void) const; + + //! + //! \brief Returns the file's size. + //! + off_t get_size(void) const; + + //! + //! \brief Returns the file's type. + //! + int get_type(void) const; + + //! + //! \brief Returns whether the file is readable by its owner or not. + //! + bool is_owner_readable(void) const; + + //! + //! \brief Returns whether the file is writable by its owner or not. + //! + bool is_owner_writable(void) const; + + //! + //! \brief Returns whether the file is executable by its owner or not. + //! + bool is_owner_executable(void) const; + + //! + //! \brief Returns whether the file is readable by the users belonging + //! to its group or not. + //! + bool is_group_readable(void) const; + + //! + //! \brief Returns whether the file is writable the users belonging to + //! its group or not. + //! + bool is_group_writable(void) const; + + //! + //! \brief Returns whether the file is executable by the users + //! belonging to its group or not. + //! + bool is_group_executable(void) const; + + //! + //! \brief Returns whether the file is readable by people different + //! than the owner and those belonging to the group or not. + //! + bool is_other_readable(void) const; + + //! + //! \brief Returns whether the file is write by people different + //! than the owner and those belonging to the group or not. + //! + bool is_other_writable(void) const; + + //! + //! \brief Returns whether the file is executable by people different + //! than the owner and those belonging to the group or not. + //! + bool is_other_executable(void) const; +}; + +// ------------------------------------------------------------------------ +// The "directory" class. +// ------------------------------------------------------------------------ + +//! +//! \brief A class representing a file system directory. +//! +//! The directory class represents a group of files in the file system and +//! corresponds to exactly one directory. +//! +class directory : public std::map< std::string, file_info > { +public: + //! + //! \brief Constructs a new directory. + //! + //! Constructs a new directory object representing the given path. + //! The directory must exist at creation time as the contents of the + //! class are gathered from it. + //! + directory(const path&); + + //! + //! \brief Returns the file names of the files in the directory. + //! + //! Returns the leaf names of all files contained in the directory. + //! I.e. the keys of the directory map. + //! + std::set< std::string > names(void) const; +}; + +// ------------------------------------------------------------------------ +// The "temp_dir" class. +// ------------------------------------------------------------------------ + +class temp_dir { + std::auto_ptr< tools::fs::path > m_path; + +public: + temp_dir(const tools::fs::path&); + ~temp_dir(void); + + const tools::fs::path& get_path(void) const; +}; + +// ------------------------------------------------------------------------ +// Free functions. +// ------------------------------------------------------------------------ + +//! +//! \brief Checks if the given path exists. +//! +bool exists(const path&); + +//! +//! \brief Looks for the given program in the PATH. +//! +//! Given a program name (without slashes) looks for it in the path and +//! returns its full path name if found, otherwise an empty path. +//! +bool have_prog_in_path(const std::string&); + +//! +//! \brief Checks if the given path exists, is accessible and is executable. +//! +bool is_executable(const path&); + +//! +//! \brief Removes a given file. +//! +void remove(const path&); + +//! +//! \brief Removes an empty directory. +//! +void rmdir(const path&); + +tools::fs::path change_directory(const tools::fs::path&); +void cleanup(const tools::fs::path&); +tools::fs::path get_current_dir(void); + +} // namespace fs +} // namespace tools + +#endif // !defined(TOOLS_FS_HPP) diff --git a/tools/fs_test.cpp b/tools/fs_test.cpp new file mode 100644 index 000000000000..5f482a4cdb0a --- /dev/null +++ b/tools/fs_test.cpp @@ -0,0 +1,743 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +extern "C" { +#include +#include +} + +#include +#include +#include + +#include + +#include "exceptions.hpp" +#include "fs.hpp" +#include "user.hpp" + +// ------------------------------------------------------------------------ +// Auxiliary functions. +// ------------------------------------------------------------------------ + +static +void +create_file(const char *name) +{ + std::ofstream os(name); + os.close(); +} + +static +void +create_files(void) +{ + ::mkdir("files", 0755); + ::mkdir("files/dir", 0755); + + std::ofstream os("files/reg"); + os.close(); + + // TODO: Should create all other file types (blk, chr, fifo, lnk, sock) + // and test for them... but the underlying file system may not support + // most of these. Specially as we are working on /tmp, which can be + // mounted with flags such as "nodev". See how to deal with this + // situation. +} + +// ------------------------------------------------------------------------ +// Test cases for the "path" class. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(path_normalize); +ATF_TEST_CASE_HEAD(path_normalize) +{ + set_md_var("descr", "Tests the path's normalization"); +} +ATF_TEST_CASE_BODY(path_normalize) +{ + using tools::fs::path; + + ATF_REQUIRE_EQ(path(".").str(), "."); + ATF_REQUIRE_EQ(path("..").str(), ".."); + + ATF_REQUIRE_EQ(path("foo").str(), "foo"); + ATF_REQUIRE_EQ(path("foo/bar").str(), "foo/bar"); + ATF_REQUIRE_EQ(path("foo/bar/").str(), "foo/bar"); + + ATF_REQUIRE_EQ(path("/foo").str(), "/foo"); + ATF_REQUIRE_EQ(path("/foo/bar").str(), "/foo/bar"); + ATF_REQUIRE_EQ(path("/foo/bar/").str(), "/foo/bar"); + + ATF_REQUIRE_EQ(path("///foo").str(), "/foo"); + ATF_REQUIRE_EQ(path("///foo///bar").str(), "/foo/bar"); + ATF_REQUIRE_EQ(path("///foo///bar///").str(), "/foo/bar"); +} + +ATF_TEST_CASE(path_is_absolute); +ATF_TEST_CASE_HEAD(path_is_absolute) +{ + set_md_var("descr", "Tests the path::is_absolute function"); +} +ATF_TEST_CASE_BODY(path_is_absolute) +{ + using tools::fs::path; + + ATF_REQUIRE( path("/").is_absolute()); + ATF_REQUIRE( path("////").is_absolute()); + ATF_REQUIRE( path("////a").is_absolute()); + ATF_REQUIRE( path("//a//").is_absolute()); + ATF_REQUIRE(!path("a////").is_absolute()); + ATF_REQUIRE(!path("../foo").is_absolute()); +} + +ATF_TEST_CASE(path_is_root); +ATF_TEST_CASE_HEAD(path_is_root) +{ + set_md_var("descr", "Tests the path::is_root function"); +} +ATF_TEST_CASE_BODY(path_is_root) +{ + using tools::fs::path; + + ATF_REQUIRE( path("/").is_root()); + ATF_REQUIRE( path("////").is_root()); + ATF_REQUIRE(!path("////a").is_root()); + ATF_REQUIRE(!path("//a//").is_root()); + ATF_REQUIRE(!path("a////").is_root()); + ATF_REQUIRE(!path("../foo").is_root()); +} + +ATF_TEST_CASE(path_branch_path); +ATF_TEST_CASE_HEAD(path_branch_path) +{ + set_md_var("descr", "Tests the path::branch_path function"); +} +ATF_TEST_CASE_BODY(path_branch_path) +{ + using tools::fs::path; + + ATF_REQUIRE_EQ(path(".").branch_path().str(), "."); + ATF_REQUIRE_EQ(path("foo").branch_path().str(), "."); + ATF_REQUIRE_EQ(path("foo/bar").branch_path().str(), "foo"); + ATF_REQUIRE_EQ(path("/foo").branch_path().str(), "/"); + ATF_REQUIRE_EQ(path("/foo/bar").branch_path().str(), "/foo"); +} + +ATF_TEST_CASE(path_leaf_name); +ATF_TEST_CASE_HEAD(path_leaf_name) +{ + set_md_var("descr", "Tests the path::leaf_name function"); +} +ATF_TEST_CASE_BODY(path_leaf_name) +{ + using tools::fs::path; + + ATF_REQUIRE_EQ(path(".").leaf_name(), "."); + ATF_REQUIRE_EQ(path("foo").leaf_name(), "foo"); + ATF_REQUIRE_EQ(path("foo/bar").leaf_name(), "bar"); + ATF_REQUIRE_EQ(path("/foo").leaf_name(), "foo"); + ATF_REQUIRE_EQ(path("/foo/bar").leaf_name(), "bar"); +} + +ATF_TEST_CASE(path_compare_equal); +ATF_TEST_CASE_HEAD(path_compare_equal) +{ + set_md_var("descr", "Tests the comparison for equality between paths"); +} +ATF_TEST_CASE_BODY(path_compare_equal) +{ + using tools::fs::path; + + ATF_REQUIRE(path("/") == path("///")); + ATF_REQUIRE(path("/a") == path("///a")); + ATF_REQUIRE(path("/a") == path("///a///")); + + ATF_REQUIRE(path("a/b/c") == path("a//b//c")); + ATF_REQUIRE(path("a/b/c") == path("a//b//c///")); +} + +ATF_TEST_CASE(path_compare_different); +ATF_TEST_CASE_HEAD(path_compare_different) +{ + set_md_var("descr", "Tests the comparison for difference between paths"); +} +ATF_TEST_CASE_BODY(path_compare_different) +{ + using tools::fs::path; + + ATF_REQUIRE(path("/") != path("//a/")); + ATF_REQUIRE(path("/a") != path("a///")); + + ATF_REQUIRE(path("a/b/c") != path("a/b")); + ATF_REQUIRE(path("a/b/c") != path("a//b")); + ATF_REQUIRE(path("a/b/c") != path("/a/b/c")); + ATF_REQUIRE(path("a/b/c") != path("/a//b//c")); +} + +ATF_TEST_CASE(path_concat); +ATF_TEST_CASE_HEAD(path_concat) +{ + set_md_var("descr", "Tests the concatenation of multiple paths"); +} +ATF_TEST_CASE_BODY(path_concat) +{ + using tools::fs::path; + + ATF_REQUIRE_EQ((path("foo") / "bar").str(), "foo/bar"); + ATF_REQUIRE_EQ((path("foo/") / "/bar").str(), "foo/bar"); + ATF_REQUIRE_EQ((path("foo/") / "/bar/baz").str(), "foo/bar/baz"); + ATF_REQUIRE_EQ((path("foo/") / "///bar///baz").str(), "foo/bar/baz"); +} + +ATF_TEST_CASE(path_to_absolute); +ATF_TEST_CASE_HEAD(path_to_absolute) +{ + set_md_var("descr", "Tests the conversion of a relative path to an " + "absolute one"); +} +ATF_TEST_CASE_BODY(path_to_absolute) +{ + using tools::fs::file_info; + using tools::fs::path; + + create_files(); + + { + const path p("."); + path pa = p.to_absolute(); + ATF_REQUIRE(pa.is_absolute()); + + file_info fi(p); + file_info fia(pa); + ATF_REQUIRE_EQ(fi.get_device(), fia.get_device()); + ATF_REQUIRE_EQ(fi.get_inode(), fia.get_inode()); + } + + { + const path p("files/reg"); + path pa = p.to_absolute(); + ATF_REQUIRE(pa.is_absolute()); + + file_info fi(p); + file_info fia(pa); + ATF_REQUIRE_EQ(fi.get_device(), fia.get_device()); + ATF_REQUIRE_EQ(fi.get_inode(), fia.get_inode()); + } +} + +ATF_TEST_CASE(path_op_less); +ATF_TEST_CASE_HEAD(path_op_less) +{ + set_md_var("descr", "Tests that the path's less-than operator works"); +} +ATF_TEST_CASE_BODY(path_op_less) +{ + using tools::fs::path; + + create_files(); + + ATF_REQUIRE(!(path("aaa") < path("aaa"))); + + ATF_REQUIRE( path("aab") < path("abc")); + ATF_REQUIRE(!(path("abc") < path("aab"))); +} + +// ------------------------------------------------------------------------ +// Test cases for the "directory" class. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(directory_read); +ATF_TEST_CASE_HEAD(directory_read) +{ + set_md_var("descr", "Tests the directory class creation, which reads " + "the contents of a directory"); +} +ATF_TEST_CASE_BODY(directory_read) +{ + using tools::fs::directory; + using tools::fs::path; + + create_files(); + + directory d(path("files")); + ATF_REQUIRE_EQ(d.size(), 4); + ATF_REQUIRE(d.find(".") != d.end()); + ATF_REQUIRE(d.find("..") != d.end()); + ATF_REQUIRE(d.find("dir") != d.end()); + ATF_REQUIRE(d.find("reg") != d.end()); +} + +ATF_TEST_CASE(directory_file_info); +ATF_TEST_CASE_HEAD(directory_file_info) +{ + set_md_var("descr", "Tests that the file_info objects attached to the " + "directory are valid"); +} +ATF_TEST_CASE_BODY(directory_file_info) +{ + using tools::fs::directory; + using tools::fs::file_info; + using tools::fs::path; + + create_files(); + + directory d(path("files")); + + { + directory::const_iterator iter = d.find("dir"); + ATF_REQUIRE(iter != d.end()); + const file_info& fi = (*iter).second; + ATF_REQUIRE(fi.get_type() == file_info::dir_type); + } + + { + directory::const_iterator iter = d.find("reg"); + ATF_REQUIRE(iter != d.end()); + const file_info& fi = (*iter).second; + ATF_REQUIRE(fi.get_type() == file_info::reg_type); + } +} + +ATF_TEST_CASE(directory_names); +ATF_TEST_CASE_HEAD(directory_names) +{ + set_md_var("descr", "Tests the directory's names method"); +} +ATF_TEST_CASE_BODY(directory_names) +{ + using tools::fs::directory; + using tools::fs::path; + + create_files(); + + directory d(path("files")); + std::set< std::string > ns = d.names(); + ATF_REQUIRE_EQ(ns.size(), 4); + ATF_REQUIRE(ns.find(".") != ns.end()); + ATF_REQUIRE(ns.find("..") != ns.end()); + ATF_REQUIRE(ns.find("dir") != ns.end()); + ATF_REQUIRE(ns.find("reg") != ns.end()); +} + +// ------------------------------------------------------------------------ +// Test cases for the "file_info" class. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(file_info_stat); +ATF_TEST_CASE_HEAD(file_info_stat) +{ + set_md_var("descr", "Tests the file_info creation and its basic contents"); +} +ATF_TEST_CASE_BODY(file_info_stat) +{ + using tools::fs::file_info; + using tools::fs::path; + + create_files(); + + { + path p("files/dir"); + file_info fi(p); + ATF_REQUIRE(fi.get_type() == file_info::dir_type); + } + + { + path p("files/reg"); + file_info fi(p); + ATF_REQUIRE(fi.get_type() == file_info::reg_type); + } +} + +ATF_TEST_CASE(file_info_perms); +ATF_TEST_CASE_HEAD(file_info_perms) +{ + set_md_var("descr", "Tests the file_info methods to get the file's " + "permissions"); +} +ATF_TEST_CASE_BODY(file_info_perms) +{ + using tools::fs::file_info; + using tools::fs::path; + + path p("file"); + + std::ofstream os(p.c_str()); + os.close(); + +#define perms(ur, uw, ux, gr, gw, gx, othr, othw, othx) \ + { \ + file_info fi(p); \ + ATF_REQUIRE(fi.is_owner_readable() == ur); \ + ATF_REQUIRE(fi.is_owner_writable() == uw); \ + ATF_REQUIRE(fi.is_owner_executable() == ux); \ + ATF_REQUIRE(fi.is_group_readable() == gr); \ + ATF_REQUIRE(fi.is_group_writable() == gw); \ + ATF_REQUIRE(fi.is_group_executable() == gx); \ + ATF_REQUIRE(fi.is_other_readable() == othr); \ + ATF_REQUIRE(fi.is_other_writable() == othw); \ + ATF_REQUIRE(fi.is_other_executable() == othx); \ + } + + ::chmod(p.c_str(), 0000); + perms(false, false, false, false, false, false, false, false, false); + + ::chmod(p.c_str(), 0001); + perms(false, false, false, false, false, false, false, false, true); + + ::chmod(p.c_str(), 0010); + perms(false, false, false, false, false, true, false, false, false); + + ::chmod(p.c_str(), 0100); + perms(false, false, true, false, false, false, false, false, false); + + ::chmod(p.c_str(), 0002); + perms(false, false, false, false, false, false, false, true, false); + + ::chmod(p.c_str(), 0020); + perms(false, false, false, false, true, false, false, false, false); + + ::chmod(p.c_str(), 0200); + perms(false, true, false, false, false, false, false, false, false); + + ::chmod(p.c_str(), 0004); + perms(false, false, false, false, false, false, true, false, false); + + ::chmod(p.c_str(), 0040); + perms(false, false, false, true, false, false, false, false, false); + + ::chmod(p.c_str(), 0400); + perms(true, false, false, false, false, false, false, false, false); + + ::chmod(p.c_str(), 0644); + perms(true, true, false, true, false, false, true, false, false); + + ::chmod(p.c_str(), 0755); + perms(true, true, true, true, false, true, true, false, true); + + ::chmod(p.c_str(), 0777); + perms(true, true, true, true, true, true, true, true, true); + +#undef perms +} + +// ------------------------------------------------------------------------ +// Test cases for the "temp_dir" class. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(temp_dir_raii); +ATF_TEST_CASE_HEAD(temp_dir_raii) +{ + set_md_var("descr", "Tests the RAII behavior of the temp_dir class"); +} +ATF_TEST_CASE_BODY(temp_dir_raii) +{ + tools::fs::path t1("non-existent"); + tools::fs::path t2("non-existent"); + + { + tools::fs::path tmpl("testdir.XXXXXX"); + tools::fs::temp_dir td1(tmpl); + tools::fs::temp_dir td2(tmpl); + t1 = td1.get_path(); + t2 = td2.get_path(); + ATF_REQUIRE(t1.str().find("XXXXXX") == std::string::npos); + ATF_REQUIRE(t2.str().find("XXXXXX") == std::string::npos); + ATF_REQUIRE(t1 != t2); + ATF_REQUIRE(!tools::fs::exists(tmpl)); + ATF_REQUIRE( tools::fs::exists(t1)); + ATF_REQUIRE( tools::fs::exists(t2)); + + tools::fs::file_info fi1(t1); + ATF_REQUIRE( fi1.is_owner_readable()); + ATF_REQUIRE( fi1.is_owner_writable()); + ATF_REQUIRE( fi1.is_owner_executable()); + ATF_REQUIRE(!fi1.is_group_readable()); + ATF_REQUIRE(!fi1.is_group_writable()); + ATF_REQUIRE(!fi1.is_group_executable()); + ATF_REQUIRE(!fi1.is_other_readable()); + ATF_REQUIRE(!fi1.is_other_writable()); + ATF_REQUIRE(!fi1.is_other_executable()); + + tools::fs::file_info fi2(t2); + ATF_REQUIRE( fi2.is_owner_readable()); + ATF_REQUIRE( fi2.is_owner_writable()); + ATF_REQUIRE( fi2.is_owner_executable()); + ATF_REQUIRE(!fi2.is_group_readable()); + ATF_REQUIRE(!fi2.is_group_writable()); + ATF_REQUIRE(!fi2.is_group_executable()); + ATF_REQUIRE(!fi2.is_other_readable()); + ATF_REQUIRE(!fi2.is_other_writable()); + ATF_REQUIRE(!fi2.is_other_executable()); + } + + ATF_REQUIRE(t1.str() != "non-existent"); + ATF_REQUIRE(!tools::fs::exists(t1)); + ATF_REQUIRE(t2.str() != "non-existent"); + ATF_REQUIRE(!tools::fs::exists(t2)); +} + + +// ------------------------------------------------------------------------ +// Test cases for the free functions. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(exists); +ATF_TEST_CASE_HEAD(exists) +{ + set_md_var("descr", "Tests the exists function"); +} +ATF_TEST_CASE_BODY(exists) +{ + using tools::fs::exists; + using tools::fs::path; + + create_files(); + + ATF_REQUIRE( exists(path("files"))); + ATF_REQUIRE(!exists(path("file"))); + ATF_REQUIRE(!exists(path("files2"))); + + ATF_REQUIRE( exists(path("files/."))); + ATF_REQUIRE( exists(path("files/.."))); + ATF_REQUIRE( exists(path("files/dir"))); + ATF_REQUIRE( exists(path("files/reg"))); + ATF_REQUIRE(!exists(path("files/foo"))); +} + +ATF_TEST_CASE(is_executable); +ATF_TEST_CASE_HEAD(is_executable) +{ + set_md_var("descr", "Tests the is_executable function"); +} +ATF_TEST_CASE_BODY(is_executable) +{ + using tools::fs::is_executable; + using tools::fs::path; + + create_files(); + + ATF_REQUIRE( is_executable(path("files"))); + ATF_REQUIRE( is_executable(path("files/."))); + ATF_REQUIRE( is_executable(path("files/.."))); + ATF_REQUIRE( is_executable(path("files/dir"))); + + ATF_REQUIRE(!is_executable(path("non-existent"))); + + ATF_REQUIRE(!is_executable(path("files/reg"))); + ATF_REQUIRE(::chmod("files/reg", 0755) != -1); + ATF_REQUIRE( is_executable(path("files/reg"))); +} + +ATF_TEST_CASE(remove); +ATF_TEST_CASE_HEAD(remove) +{ + set_md_var("descr", "Tests the remove function"); +} +ATF_TEST_CASE_BODY(remove) +{ + using tools::fs::exists; + using tools::fs::path; + using tools::fs::remove; + + create_files(); + + ATF_REQUIRE( exists(path("files/reg"))); + remove(path("files/reg")); + ATF_REQUIRE(!exists(path("files/reg"))); + + ATF_REQUIRE( exists(path("files/dir"))); + ATF_REQUIRE_THROW(tools::system_error, remove(path("files/dir"))); + ATF_REQUIRE( exists(path("files/dir"))); +} + +ATF_TEST_CASE(cleanup); +ATF_TEST_CASE_HEAD(cleanup) +{ + set_md_var("descr", "Tests the cleanup function"); +} +ATF_TEST_CASE_BODY(cleanup) +{ + using tools::fs::cleanup; + + ::mkdir("root", 0755); + ::mkdir("root/dir", 0755); + ::mkdir("root/dir/1", 0100); + ::mkdir("root/dir/2", 0644); + create_file("root/reg"); + + tools::fs::path p("root"); + ATF_REQUIRE(tools::fs::exists(p)); + ATF_REQUIRE(tools::fs::exists(p / "dir")); + ATF_REQUIRE(tools::fs::exists(p / "dir/1")); + ATF_REQUIRE(tools::fs::exists(p / "dir/2")); + ATF_REQUIRE(tools::fs::exists(p / "reg")); + cleanup(p); + ATF_REQUIRE(!tools::fs::exists(p)); +} + +ATF_TEST_CASE(cleanup_eacces_on_root); +ATF_TEST_CASE_HEAD(cleanup_eacces_on_root) +{ + set_md_var("descr", "Tests the cleanup function"); +} +ATF_TEST_CASE_BODY(cleanup_eacces_on_root) +{ + using tools::fs::cleanup; + + ::mkdir("aux", 0755); + ::mkdir("aux/root", 0755); + ATF_REQUIRE(::chmod("aux", 0555) != -1); + + try { + cleanup(tools::fs::path("aux/root")); + ATF_REQUIRE(tools::user::is_root()); + } catch (const tools::system_error& e) { + ATF_REQUIRE(!tools::user::is_root()); + ATF_REQUIRE_EQ(EACCES, e.code()); + } +} + +ATF_TEST_CASE(cleanup_eacces_on_subdir); +ATF_TEST_CASE_HEAD(cleanup_eacces_on_subdir) +{ + set_md_var("descr", "Tests the cleanup function"); +} +ATF_TEST_CASE_BODY(cleanup_eacces_on_subdir) +{ + using tools::fs::cleanup; + + ::mkdir("root", 0755); + ::mkdir("root/1", 0755); + ::mkdir("root/1/2", 0755); + ::mkdir("root/1/2/3", 0755); + ATF_REQUIRE(::chmod("root/1/2", 0555) != -1); + ATF_REQUIRE(::chmod("root/1", 0555) != -1); + + const tools::fs::path p("root"); + cleanup(p); + ATF_REQUIRE(!tools::fs::exists(p)); +} + +ATF_TEST_CASE(change_directory); +ATF_TEST_CASE_HEAD(change_directory) +{ + set_md_var("descr", "Tests the change_directory function"); +} +ATF_TEST_CASE_BODY(change_directory) +{ + using tools::fs::change_directory; + using tools::fs::get_current_dir; + + ::mkdir("files", 0755); + ::mkdir("files/dir", 0755); + create_file("files/reg"); + + const tools::fs::path old = get_current_dir(); + + ATF_REQUIRE_THROW(tools::system_error, + change_directory(tools::fs::path("files/reg"))); + ATF_REQUIRE(get_current_dir() == old); + + tools::fs::path old2 = change_directory(tools::fs::path("files")); + ATF_REQUIRE(old2 == old); + tools::fs::path old3 = change_directory(tools::fs::path("dir")); + ATF_REQUIRE(old3 == old2 / "files"); + tools::fs::path old4 = change_directory(tools::fs::path("../..")); + ATF_REQUIRE(old4 == old3 / "dir"); + ATF_REQUIRE(get_current_dir() == old); +} + +ATF_TEST_CASE(get_current_dir); +ATF_TEST_CASE_HEAD(get_current_dir) +{ + set_md_var("descr", "Tests the get_current_dir function"); +} +ATF_TEST_CASE_BODY(get_current_dir) +{ + using tools::fs::change_directory; + using tools::fs::get_current_dir; + + ::mkdir("files", 0755); + ::mkdir("files/dir", 0755); + create_file("files/reg"); + + tools::fs::path curdir = get_current_dir(); + change_directory(tools::fs::path(".")); + ATF_REQUIRE(get_current_dir() == curdir); + change_directory(tools::fs::path("files")); + ATF_REQUIRE(get_current_dir() == curdir / "files"); + change_directory(tools::fs::path("dir")); + ATF_REQUIRE(get_current_dir() == curdir / "files/dir"); + change_directory(tools::fs::path("..")); + ATF_REQUIRE(get_current_dir() == curdir / "files"); + change_directory(tools::fs::path("..")); + ATF_REQUIRE(get_current_dir() == curdir); +} + +// ------------------------------------------------------------------------ +// Main. +// ------------------------------------------------------------------------ + +ATF_INIT_TEST_CASES(tcs) +{ + // Add the tests for the "path" class. + ATF_ADD_TEST_CASE(tcs, path_normalize); + ATF_ADD_TEST_CASE(tcs, path_is_absolute); + ATF_ADD_TEST_CASE(tcs, path_is_root); + ATF_ADD_TEST_CASE(tcs, path_branch_path); + ATF_ADD_TEST_CASE(tcs, path_leaf_name); + ATF_ADD_TEST_CASE(tcs, path_compare_equal); + ATF_ADD_TEST_CASE(tcs, path_compare_different); + ATF_ADD_TEST_CASE(tcs, path_concat); + ATF_ADD_TEST_CASE(tcs, path_to_absolute); + ATF_ADD_TEST_CASE(tcs, path_op_less); + + // Add the tests for the "file_info" class. + ATF_ADD_TEST_CASE(tcs, file_info_stat); + ATF_ADD_TEST_CASE(tcs, file_info_perms); + + // Add the tests for the "directory" class. + ATF_ADD_TEST_CASE(tcs, directory_read); + ATF_ADD_TEST_CASE(tcs, directory_names); + ATF_ADD_TEST_CASE(tcs, directory_file_info); + + // Add the tests for the "temp_dir" class. + ATF_ADD_TEST_CASE(tcs, temp_dir_raii); + + // Add the tests for the free functions. + ATF_ADD_TEST_CASE(tcs, exists); + ATF_ADD_TEST_CASE(tcs, is_executable); + ATF_ADD_TEST_CASE(tcs, remove); + ATF_ADD_TEST_CASE(tcs, cleanup); + ATF_ADD_TEST_CASE(tcs, cleanup_eacces_on_root); + ATF_ADD_TEST_CASE(tcs, cleanup_eacces_on_subdir); + ATF_ADD_TEST_CASE(tcs, change_directory); + ATF_ADD_TEST_CASE(tcs, get_current_dir); +} diff --git a/atf-version/generate-revision.sh b/tools/generate-revision.sh similarity index 100% rename from atf-version/generate-revision.sh rename to tools/generate-revision.sh diff --git a/atf-run/io.cpp b/tools/io.cpp similarity index 87% rename from atf-run/io.cpp rename to tools/io.cpp index c99ee34ef211..4cf8f6a4bfaa 100644 --- a/atf-run/io.cpp +++ b/tools/io.cpp @@ -34,21 +34,16 @@ extern "C" { #include } +#include #include #include -extern "C" { -#include "../atf-c/error.h" -} - -#include "../atf-c++/detail/auto_array.hpp" -#include "../atf-c++/detail/exceptions.hpp" -#include "../atf-c++/detail/sanity.hpp" - +#include "auto_array.hpp" +#include "exceptions.hpp" #include "io.hpp" -namespace impl = atf::atf_run; -#define IMPL_NAME "atf::atf_run" +namespace impl = tools::io; +#define IMPL_NAME "tools::io" // ------------------------------------------------------------------------ // The "file_handle" class. @@ -62,7 +57,7 @@ impl::file_handle::file_handle(void) : impl::file_handle::file_handle(handle_type h) : m_handle(h) { - PRE(m_handle != invalid_value()); + assert(m_handle != invalid_value()); } impl::file_handle::file_handle(const file_handle& fh) : @@ -96,7 +91,7 @@ impl::file_handle::is_valid(void) void impl::file_handle::close(void) { - PRE(is_valid()); + assert(is_valid()); ::close(m_handle); @@ -106,7 +101,7 @@ impl::file_handle::close(void) impl::file_handle::handle_type impl::file_handle::disown(void) { - PRE(is_valid()); + assert(is_valid()); handle_type h = m_handle; m_handle = invalid_value(); @@ -117,7 +112,7 @@ impl::file_handle::handle_type impl::file_handle::get(void) const { - PRE(is_valid()); + assert(is_valid()); return m_handle; } @@ -125,19 +120,19 @@ impl::file_handle::get(void) void impl::file_handle::posix_remap(handle_type h) { - PRE(is_valid()); + assert(is_valid()); if (m_handle == h) return; if (::dup2(m_handle, h) == -1) - throw system_error(IMPL_NAME "::file_handle::posix_remap", - "dup2(2) failed", errno); + throw tools::system_error(IMPL_NAME "::file_handle::posix_remap", + "dup2(2) failed", errno); if (::close(m_handle) == -1) { ::close(h); - throw system_error(IMPL_NAME "::file_handle::posix_remap", - "close(2) failed", errno); + throw tools::system_error(IMPL_NAME "::file_handle::posix_remap", + "close(2) failed", errno); } m_handle = h; @@ -159,8 +154,8 @@ impl::systembuf::systembuf(handle_type h, std::size_t bufsize) : m_read_buf(NULL), m_write_buf(NULL) { - PRE(m_handle >= 0); - PRE(m_bufsize > 0); + assert(m_handle >= 0); + assert(m_bufsize > 0); try { m_read_buf = new char[bufsize]; @@ -185,7 +180,7 @@ impl::systembuf::~systembuf(void) impl::systembuf::int_type impl::systembuf::underflow(void) { - PRE(gptr() >= egptr()); + assert(gptr() >= egptr()); bool ok; ssize_t cnt = ::read(m_handle, m_read_buf, m_bufsize); @@ -202,7 +197,7 @@ impl::systembuf::underflow(void) impl::systembuf::int_type impl::systembuf::overflow(int c) { - PRE(pptr() >= epptr()); + assert(pptr() >= epptr()); if (sync() == -1) return traits_type::eof(); if (!traits_type::eq_int_type(c, traits_type::eof())) { @@ -248,10 +243,10 @@ safe_poll(struct pollfd fds[], nfds_t nfds, int timeout) if (errno == EINTR) ret = 0; else - throw atf::system_error(IMPL_NAME "::safe_poll", "poll(2) failed", + throw tools::system_error(IMPL_NAME "::safe_poll", "poll(2) failed", errno); } - INV(ret >= 0); + assert(ret >= 0); return ret; } @@ -262,15 +257,15 @@ safe_read(const int fd, void* buffer, const size_t nbytes, int ret; while ((ret = ::read(fd, buffer, nbytes)) == -1 && errno == EINTR) {} if (ret == -1) { - INV(errno != EINTR); + assert(errno != EINTR); if (report_errors) - throw atf::system_error(IMPL_NAME "::safe_read", "read(2) failed", + throw tools::system_error(IMPL_NAME "::safe_read", "read(2) failed", errno); else ret = 0; } - INV(ret >= 0); + assert(ret >= 0); return static_cast< size_t >(ret); } @@ -290,10 +285,10 @@ size_t impl::muxer::read_one(const size_t index, const int fd, std::string& accum, const bool report_errors) { - atf::auto_array< char > buffer(new char[m_bufsize]); + tools::auto_array< char > buffer(new char[m_bufsize]); const size_t nbytes = safe_read(fd, buffer.get(), m_bufsize - 1, report_errors); - INV(nbytes < m_bufsize); + assert(nbytes < m_bufsize); buffer[nbytes] = '\0'; std::string line(accum); @@ -319,7 +314,7 @@ impl::muxer::read_one(const size_t index, const int fd, std::string& accum, void impl::muxer::mux(volatile const bool& terminate) { - atf::auto_array< struct pollfd > poll_fds(new struct pollfd[m_nfds]); + tools::auto_array< struct pollfd > poll_fds(new struct pollfd[m_nfds]); for (size_t i = 0; i < m_nfds; i++) { poll_fds[i].fd = m_fds[i]; poll_fds[i].events = POLLIN; @@ -339,7 +334,7 @@ impl::muxer::mux(volatile const bool& terminate) // a call to the flush method. poll_fds[i].events = 0; - INV(nactive >= 1); + assert(nactive >= 1); nactive--; } else if (poll_fds[i].revents & (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI)) { diff --git a/atf-run/io.hpp b/tools/io.hpp similarity index 96% rename from atf-run/io.hpp rename to tools/io.hpp index b8ff59a808d9..3fb417b8db85 100644 --- a/atf-run/io.hpp +++ b/tools/io.hpp @@ -27,20 +27,18 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_RUN_IO_HPP_) -#define _ATF_RUN_IO_HPP_ +#if !defined(TOOLS_IO_HPP) +#define TOOLS_IO_HPP #include #include #include +#include "auto_array.hpp" #include "fs.hpp" -#include "../atf-c++/detail/auto_array.hpp" -#include "../atf-c++/noncopyable.hpp" - -namespace atf { -namespace atf_run { +namespace tools { +namespace io { // ------------------------------------------------------------------------ // The "file_handle" class. @@ -254,8 +252,12 @@ class file_handle //! However, it is not copyable to avoid introducing inconsistences with //! the on-disk file and the in-memory buffers. //! -class systembuf : public std::streambuf, atf::noncopyable +class systembuf : public std::streambuf { + // Non-copyable. + systembuf(const systembuf&); + systembuf& operator=(const systembuf&); + public: typedef int handle_type; @@ -374,8 +376,12 @@ class systembuf : public std::streambuf, atf::noncopyable //! this happens, the buffer eventually empties and the system blocks //! until the writer generates some data. //! -class pistream : public std::istream, noncopyable +class pistream : public std::istream { + // Non-copyable. + pistream(const pistream&); + pistream& operator=(const pistream&); + //! //! \brief The systembuf object used to manage this stream's data. //! @@ -400,12 +406,16 @@ class pistream : public std::istream, noncopyable // The "muxer" class. // ------------------------------------------------------------------------ -class muxer : noncopyable { +class muxer { + // Non-copyable. + muxer(const muxer&); + muxer& operator=(const muxer&); + const int* m_fds; const size_t m_nfds; const size_t m_bufsize; - atf::auto_array< std::string > m_buffers; + tools::auto_array< std::string > m_buffers; protected: virtual void line_callback(const size_t, const std::string&) = 0; @@ -420,7 +430,7 @@ class muxer : noncopyable { void flush(void); }; -} // namespace atf_run -} // namespace atf +} // namespace io +} // namespace tools -#endif // !defined(_ATF_RUN_IO_HPP_) +#endif // !defined(TOOLS_IO_HPP) diff --git a/atf-run/io_test.cpp b/tools/io_test.cpp similarity index 95% rename from atf-run/io_test.cpp rename to tools/io_test.cpp index 03fc97e82e8f..b55428f2829a 100644 --- a/atf-run/io_test.cpp +++ b/tools/io_test.cpp @@ -35,6 +35,7 @@ extern "C" { #include } +#include #include #include #include @@ -44,8 +45,7 @@ extern "C" { #include #include -#include "../atf-c++/detail/sanity.hpp" -#include "../atf-c++/macros.hpp" +#include #include "io.hpp" #include "signals.hpp" @@ -90,7 +90,7 @@ static void systembuf_test_read(std::size_t length, std::size_t bufsize) { - using atf::atf_run::systembuf; + using tools::io::systembuf; std::ofstream f("test_read.txt"); systembuf_write_data(f, length); @@ -109,7 +109,7 @@ static void systembuf_test_write(std::size_t length, std::size_t bufsize) { - using atf::atf_run::systembuf; + using tools::io::systembuf; int fd = ::open("test_write.txt", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); @@ -136,7 +136,7 @@ ATF_TEST_CASE_HEAD(file_handle_ctor) } ATF_TEST_CASE_BODY(file_handle_ctor) { - using atf::atf_run::file_handle; + using tools::io::file_handle; file_handle fh1; ATF_REQUIRE(!fh1.is_valid()); @@ -153,7 +153,7 @@ ATF_TEST_CASE_HEAD(file_handle_copy) } ATF_TEST_CASE_BODY(file_handle_copy) { - using atf::atf_run::file_handle; + using tools::io::file_handle; file_handle fh1; file_handle fh2(STDOUT_FILENO); @@ -176,7 +176,7 @@ ATF_TEST_CASE_HEAD(file_handle_get) } ATF_TEST_CASE_BODY(file_handle_get) { - using atf::atf_run::file_handle; + using tools::io::file_handle; file_handle fh1(STDOUT_FILENO); ATF_REQUIRE_EQ(fh1.get(), STDOUT_FILENO); @@ -189,7 +189,7 @@ ATF_TEST_CASE_HEAD(file_handle_posix_remap) } ATF_TEST_CASE_BODY(file_handle_posix_remap) { - using atf::atf_run::file_handle; + using tools::io::file_handle; int pfd[2]; @@ -282,9 +282,9 @@ ATF_TEST_CASE_HEAD(pistream) } ATF_TEST_CASE_BODY(pistream) { - using atf::atf_run::file_handle; - using atf::atf_run::pistream; - using atf::atf_run::systembuf; + using tools::io::file_handle; + using tools::io::pistream; + using tools::io::systembuf; int fds[2]; ATF_REQUIRE(::pipe(fds) != -1); @@ -321,7 +321,7 @@ check_stream(std::ostream& os) os.clear(); } -class mock_muxer : public atf::atf_run::muxer { +class mock_muxer : public tools::io::muxer { void line_callback(const size_t index, const std::string& line) { // The following should be enabled but causes the output to be so big @@ -349,7 +349,7 @@ class mock_muxer : public atf::atf_run::muxer { static bool child_finished = false; static void sigchld_handler(int signo) { - INV(signo == SIGCHLD); + assert(signo == SIGCHLD); child_finished = true; } @@ -381,7 +381,7 @@ muxer_test(const size_t bufsize, const size_t iterations) ATF_REQUIRE(pipe(pipeout) != -1); ATF_REQUIRE(pipe(pipeerr) != -1); - atf::atf_run::signal_programmer sigchld(SIGCHLD, sigchld_handler); + tools::signals::signal_programmer sigchld(SIGCHLD, sigchld_handler); std::cout.flush(); std::cerr.flush(); @@ -391,7 +391,7 @@ muxer_test(const size_t bufsize, const size_t iterations) if (pid == 0) { sigchld.unprogram(); child_printer(pipeout, pipeerr, iterations); - UNREACHABLE; + std::abort(); } ::close(pipeout[1]); ::close(pipeerr[1]); diff --git a/atf-run/misc_helpers.cpp b/tools/misc_helpers.cpp similarity index 86% rename from atf-run/misc_helpers.cpp rename to tools/misc_helpers.cpp index abc9a4a945fe..8ec4ddefcd88 100644 --- a/atf-run/misc_helpers.cpp +++ b/tools/misc_helpers.cpp @@ -41,12 +41,11 @@ extern "C" { #include #include -#include "atf-c++/macros.hpp" +#include -#include "atf-c++/detail/env.hpp" -#include "atf-c++/detail/fs.hpp" -#include "atf-c++/detail/process.hpp" -#include "atf-c++/detail/sanity.hpp" +#include "env.hpp" +#include "fs.hpp" +#include "process.hpp" // ------------------------------------------------------------------------ // Auxiliary functions. @@ -63,7 +62,7 @@ touch(const std::string& path) } // ------------------------------------------------------------------------ -// Helper tests for "t_integration". +// Helper tests for "atf-run_test". // ------------------------------------------------------------------------ ATF_TEST_CASE(pass); @@ -127,7 +126,7 @@ ATF_TEST_CASE_BODY(mux_streams) std::cerr << "stderr " << i << "\n"; break; default: - UNREACHABLE; + std::abort(); } } } @@ -151,11 +150,11 @@ ATF_TEST_CASE_HEAD(env_list) } ATF_TEST_CASE_BODY(env_list) { - const atf::process::status s = - atf::process::exec(atf::fs::path("env"), - atf::process::argv_array("env", NULL), - atf::process::stream_inherit(), - atf::process::stream_inherit()); + const tools::process::status s = + tools::process::exec(tools::fs::path("env"), + tools::process::argv_array("env", NULL), + tools::process::stream_inherit(), + tools::process::stream_inherit()); ATF_REQUIRE(s.exited()); ATF_REQUIRE(s.exitstatus() == EXIT_SUCCESS); } @@ -167,10 +166,10 @@ ATF_TEST_CASE_HEAD(env_home) } ATF_TEST_CASE_BODY(env_home) { - ATF_REQUIRE(atf::env::has("HOME")); - atf::fs::path p(atf::env::get("HOME")); - atf::fs::file_info fi1(p); - atf::fs::file_info fi2(atf::fs::path(".")); + ATF_REQUIRE(tools::env::has("HOME")); + tools::fs::path p(tools::env::get("HOME")); + tools::fs::file_info fi1(p); + tools::fs::file_info fi2(tools::fs::path(".")); ATF_REQUIRE_EQ(fi1.get_device(), fi2.get_device()); ATF_REQUIRE_EQ(fi1.get_inode(), fi2.get_inode()); } @@ -225,7 +224,7 @@ ATF_TEST_CASE_BODY(cleanup_states) } ATF_TEST_CASE_CLEANUP(cleanup_states) { - atf::fs::remove(atf::fs::path(get_config_var("statedir") + "/to-delete")); + tools::fs::remove(tools::fs::path(get_config_var("statedir") + "/to-delete")); } ATF_TEST_CASE_WITH_CLEANUP(cleanup_curdir); @@ -367,15 +366,41 @@ ATF_TEST_CASE_BODY(use_fs) touch("test-file"); } +// ------------------------------------------------------------------------ +// Helper tests for "atf-report_test". +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(diff); +ATF_TEST_CASE_HEAD(diff) +{ + set_md_var("descr", "Helper test case for the t_integration program"); +} +ATF_TEST_CASE_BODY(diff) +{ + std::cout << "--- a 2007-11-04 14:00:41.000000000 +0100\n"; + std::cout << "+++ b 2007-11-04 14:00:48.000000000 +0100\n"; + std::cout << "@@ -1,7 +1,7 @@\n"; + std::cout << " This test is meant to simulate a diff.\n"; + std::cout << " Blank space at beginning of context lines must be " + "preserved.\n"; + std::cout << " \n"; + std::cout << "-First original line.\n"; + std::cout << "-Second original line.\n"; + std::cout << "+First modified line.\n"; + std::cout << "+Second modified line.\n"; + std::cout << " \n"; + std::cout << " EOF\n"; +} + // ------------------------------------------------------------------------ // Main. // ------------------------------------------------------------------------ ATF_INIT_TEST_CASES(tcs) { - std::string which = atf::env::get("TESTCASE"); + std::string which = tools::env::get("TESTCASE"); - // Add helper tests for t_integration. + // Add helper tests for atf-run_test. if (which == "pass") ATF_ADD_TEST_CASE(tcs, pass); if (which == "config") @@ -416,4 +441,8 @@ ATF_INIT_TEST_CASES(tcs) ATF_ADD_TEST_CASE(tcs, timeout_forkexit); if (which == "use_fs") ATF_ADD_TEST_CASE(tcs, use_fs); + + // Add helper tests for atf-report_test. + if (which == "diff") + ATF_ADD_TEST_CASE(tcs, diff); } diff --git a/atf-c++/detail/parser.cpp b/tools/parser.cpp similarity index 95% rename from atf-c++/detail/parser.cpp rename to tools/parser.cpp index 7e7f680c573f..e6b3a3b750ef 100644 --- a/atf-c++/detail/parser.cpp +++ b/tools/parser.cpp @@ -27,14 +27,14 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +#include #include #include "parser.hpp" -#include "sanity.hpp" #include "text.hpp" -namespace impl = atf::parser; -#define IMPL_NAME "atf::parser" +namespace impl = tools::parser; +#define IMPL_NAME "tools::parser" // ------------------------------------------------------------------------ // The "parse_error" class. @@ -68,7 +68,7 @@ impl::parse_error::what(void) impl::parse_error::operator std::string(void) const { - return atf::text::to_string(first) + ": " + second; + return tools::text::to_string(first) + ": " + second; } // ------------------------------------------------------------------------ @@ -91,7 +91,7 @@ impl::parse_errors::what(void) const throw() { try { - m_msg = atf::text::join(*this, "\n"); + m_msg = tools::text::join(*this, "\n"); return m_msg.c_str(); } catch (...) { return "Could not format messages for parsing errors."; @@ -204,7 +204,7 @@ const std::string& impl::header_entry::get_attr(const std::string& n) const { attrs_map::const_iterator iter = m_attrs.find(n); - PRE(iter != m_attrs.end()); + assert(iter != m_attrs.end()); return (*iter).second; } @@ -284,7 +284,7 @@ write(std::ostream& os, const impl::header_entry& he) impl::attrs_map as = he.attrs(); for (impl::attrs_map::const_iterator iter = as.begin(); iter != as.end(); iter++) { - PRE((*iter).second.find('\"') == std::string::npos); + assert((*iter).second.find('\"') == std::string::npos); line += "; " + (*iter).first + "=\"" + (*iter).second + "\""; } @@ -347,9 +347,9 @@ impl::read_headers(std::istream& is, size_t curline) void impl::write_headers(const impl::headers_map& hm, std::ostream& os) { - PRE(!hm.empty()); + assert(!hm.empty()); headers_map::const_iterator ct = hm.find("Content-Type"); - PRE(ct != hm.end()); + assert(ct != hm.end()); header::write(os, (*ct).second); for (headers_map::const_iterator iter = hm.begin(); iter != hm.end(); iter++) { @@ -376,7 +376,7 @@ impl::validate_content_type(const impl::headers_map& hm, const std::string& fmt, if (!he.has_attr("version")) throw format_error("Could not determine version"); - const std::string& vstr = atf::text::to_string(version); + const std::string& vstr = tools::text::to_string(version); if (he.get_attr("version") != vstr) throw format_error("Mismatched version: expected `" + vstr + "' but got `" + diff --git a/atf-c++/detail/parser.hpp b/tools/parser.hpp similarity index 99% rename from atf-c++/detail/parser.hpp rename to tools/parser.hpp index f55973f50c42..eb00cb466dad 100644 --- a/atf-c++/detail/parser.hpp +++ b/tools/parser.hpp @@ -27,8 +27,8 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_CXX_PARSER_HPP_) -#define _ATF_CXX_PARSER_HPP_ +#if !defined(TOOLS_PARSER_HPP) +#define TOOLS_PARSER_HPP #include #include @@ -38,7 +38,7 @@ #include #include -namespace atf { +namespace tools { namespace parser { // ------------------------------------------------------------------------ @@ -602,6 +602,6 @@ void write_headers(const headers_map&, std::ostream&); void validate_content_type(const headers_map&, const std::string&, int); } // namespace parser -} // namespace atf +} // namespace tools -#endif // !defined(_ATF_CXX_PARSER_HPP_) +#endif // !defined(TOOLS_PARSER_HPP) diff --git a/atf-c++/detail/parser_test.cpp b/tools/parser_test.cpp similarity index 93% rename from atf-c++/detail/parser_test.cpp rename to tools/parser_test.cpp index 491c01457964..434a1a6780c4 100644 --- a/atf-c++/detail/parser_test.cpp +++ b/tools/parser_test.cpp @@ -29,7 +29,7 @@ #include -#include "../macros.hpp" +#include #include "parser.hpp" #include "test_helpers.hpp" @@ -45,7 +45,7 @@ ATF_TEST_CASE_HEAD(parse_error_to_string) } ATF_TEST_CASE_BODY(parse_error_to_string) { - using atf::parser::parse_error; + using tools::parser::parse_error; const parse_error e(123, "This is the message"); ATF_REQUIRE_EQ("123: This is the message", std::string(e)); @@ -62,8 +62,8 @@ ATF_TEST_CASE_HEAD(parse_errors_what) } ATF_TEST_CASE_BODY(parse_errors_what) { - using atf::parser::parse_error; - using atf::parser::parse_errors; + using tools::parser::parse_error; + using tools::parser::parse_errors; parse_errors es; es.push_back(parse_error(2, "Second error")); @@ -83,7 +83,7 @@ ATF_TEST_CASE_HEAD(token_getters) } ATF_TEST_CASE_BODY(token_getters) { - using atf::parser::token; + using tools::parser::token; { token t(10, 0); @@ -120,21 +120,21 @@ ATF_TEST_CASE_BODY(token_getters) #define EXPECT(tkz, ttype, ttext) \ do { \ - atf::parser::token t = tkz.next(); \ + tools::parser::token t = tkz.next(); \ ATF_REQUIRE(t.type() == ttype); \ ATF_REQUIRE_EQ(t.text(), ttext); \ } while (false); namespace minimal { - static const atf::parser::token_type eof_type = 0; - static const atf::parser::token_type nl_type = 1; - static const atf::parser::token_type word_type = 2; + static const tools::parser::token_type eof_type = 0; + static const tools::parser::token_type nl_type = 1; + static const tools::parser::token_type word_type = 2; - class tokenizer : public atf::parser::tokenizer< std::istream > { + class tokenizer : public tools::parser::tokenizer< std::istream > { public: tokenizer(std::istream& is, bool skipws) : - atf::parser::tokenizer< std::istream > + tools::parser::tokenizer< std::istream > (is, skipws, eof_type, nl_type, word_type) { } @@ -144,17 +144,17 @@ namespace minimal { namespace delims { - static const atf::parser::token_type eof_type = 0; - static const atf::parser::token_type nl_type = 1; - static const atf::parser::token_type word_type = 2; - static const atf::parser::token_type plus_type = 3; - static const atf::parser::token_type minus_type = 4; - static const atf::parser::token_type equal_type = 5; + static const tools::parser::token_type eof_type = 0; + static const tools::parser::token_type nl_type = 1; + static const tools::parser::token_type word_type = 2; + static const tools::parser::token_type plus_type = 3; + static const tools::parser::token_type minus_type = 4; + static const tools::parser::token_type equal_type = 5; - class tokenizer : public atf::parser::tokenizer< std::istream > { + class tokenizer : public tools::parser::tokenizer< std::istream > { public: tokenizer(std::istream& is, bool skipws) : - atf::parser::tokenizer< std::istream > + tools::parser::tokenizer< std::istream > (is, skipws, eof_type, nl_type, word_type) { add_delim('+', plus_type); @@ -167,17 +167,17 @@ namespace delims { namespace keywords { - static const atf::parser::token_type eof_type = 0; - static const atf::parser::token_type nl_type = 1; - static const atf::parser::token_type word_type = 2; - static const atf::parser::token_type var_type = 3; - static const atf::parser::token_type loop_type = 4; - static const atf::parser::token_type endloop_type = 5; + static const tools::parser::token_type eof_type = 0; + static const tools::parser::token_type nl_type = 1; + static const tools::parser::token_type word_type = 2; + static const tools::parser::token_type var_type = 3; + static const tools::parser::token_type loop_type = 4; + static const tools::parser::token_type endloop_type = 5; - class tokenizer : public atf::parser::tokenizer< std::istream > { + class tokenizer : public tools::parser::tokenizer< std::istream > { public: tokenizer(std::istream& is, bool skipws) : - atf::parser::tokenizer< std::istream > + tools::parser::tokenizer< std::istream > (is, skipws, eof_type, nl_type, word_type) { add_keyword("var", var_type); @@ -190,15 +190,15 @@ namespace keywords { namespace quotes { - static const atf::parser::token_type eof_type = 0; - static const atf::parser::token_type nl_type = 1; - static const atf::parser::token_type word_type = 2; - static const atf::parser::token_type dblquote_type = 3; + static const tools::parser::token_type eof_type = 0; + static const tools::parser::token_type nl_type = 1; + static const tools::parser::token_type word_type = 2; + static const tools::parser::token_type dblquote_type = 3; - class tokenizer : public atf::parser::tokenizer< std::istream > { + class tokenizer : public tools::parser::tokenizer< std::istream > { public: tokenizer(std::istream& is, bool skipws) : - atf::parser::tokenizer< std::istream > + tools::parser::tokenizer< std::istream > (is, skipws, eof_type, nl_type, word_type) { add_quote('"', dblquote_type); @@ -739,9 +739,9 @@ class header_reader { void read(void) { - std::pair< size_t, atf::parser::headers_map > hml = - atf::parser::read_headers(m_is, 1); - atf::parser::validate_content_type(hml.second, + std::pair< size_t, tools::parser::headers_map > hml = + tools::parser::read_headers(m_is, 1); + tools::parser::validate_content_type(hml.second, "application/X-atf-headers-test", 1234); } diff --git a/atf-run/pass_helper.cpp b/tools/pass_helper.cpp similarity index 98% rename from atf-run/pass_helper.cpp rename to tools/pass_helper.cpp index b752b131b387..4fa75b4e93c2 100644 --- a/atf-run/pass_helper.cpp +++ b/tools/pass_helper.cpp @@ -27,7 +27,7 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#include "atf-c++/macros.hpp" +#include ATF_TEST_CASE(main); ATF_TEST_CASE_HEAD(main) diff --git a/tools/process.cpp b/tools/process.cpp new file mode 100644 index 000000000000..987a60e14e00 --- /dev/null +++ b/tools/process.cpp @@ -0,0 +1,492 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2008 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +extern "C" { +#include +#include + +#include +#include +} + +#include +#include +#include +#include +#include + +#include "defs.hpp" +#include "exceptions.hpp" +#include "text.hpp" +#include "process.hpp" + +namespace detail = tools::process::detail; +namespace impl = tools::process; +#define IMPL_NAME "tools::process" + +// ------------------------------------------------------------------------ +// Auxiliary functions. +// ------------------------------------------------------------------------ + +template< class C > +tools::auto_array< const char* > +collection_to_argv(const C& c) +{ + tools::auto_array< const char* > argv(new const char*[c.size() + 1]); + + std::size_t pos = 0; + for (typename C::const_iterator iter = c.begin(); iter != c.end(); + iter++) { + argv[pos] = (*iter).c_str(); + pos++; + } + assert(pos == c.size()); + argv[pos] = NULL; + + return argv; +} + +template< class C > +C +argv_to_collection(const char* const* argv) +{ + C c; + + for (const char* const* iter = argv; *iter != NULL; iter++) + c.push_back(std::string(*iter)); + + return c; +} + +static +void +safe_dup(const int oldfd, const int newfd) +{ + if (oldfd != newfd) { + if (dup2(oldfd, newfd) == -1) { + throw tools::system_error(IMPL_NAME "::safe_dup", + "Could not allocate file descriptor", + errno); + } else { + ::close(oldfd); + } + } +} + +static +int +const_execvp(const char *file, const char *const *argv) +{ +#define UNCONST(a) ((void *)(unsigned long)(const void *)(a)) + return ::execvp(file, (char* const*)(UNCONST(argv))); +#undef UNCONST +} + +void +detail::do_exec(void *v) +{ + struct exec_args *ea = reinterpret_cast(v); + + if (ea->m_prehook != NULL) + ea->m_prehook(); + + const int ret = const_execvp(ea->m_prog.c_str(), ea->m_argv.exec_argv()); + const int errnocopy = errno; + assert(ret == -1); + std::cerr << "exec(" << ea->m_prog.str() << ") failed: " + << std::strerror(errnocopy) << "\n"; + std::exit(EXIT_FAILURE); +} + +// ------------------------------------------------------------------------ +// The "argv_array" type. +// ------------------------------------------------------------------------ + +impl::argv_array::argv_array(void) : + m_exec_argv(collection_to_argv(m_args)) +{ +} + +impl::argv_array::argv_array(const char* arg1, ...) +{ + m_args.push_back(arg1); + + { + va_list ap; + const char* nextarg; + + va_start(ap, arg1); + while ((nextarg = va_arg(ap, const char*)) != NULL) + m_args.push_back(nextarg); + va_end(ap); + } + + ctor_init_exec_argv(); +} + +impl::argv_array::argv_array(const char* const* ca) : + m_args(argv_to_collection< args_vector >(ca)), + m_exec_argv(collection_to_argv(m_args)) +{ +} + +impl::argv_array::argv_array(const argv_array& a) : + m_args(a.m_args), + m_exec_argv(collection_to_argv(m_args)) +{ +} + +void +impl::argv_array::ctor_init_exec_argv(void) +{ + m_exec_argv = collection_to_argv(m_args); +} + +const char* const* +impl::argv_array::exec_argv(void) + const +{ + return m_exec_argv.get(); +} + +impl::argv_array::size_type +impl::argv_array::size(void) + const +{ + return m_args.size(); +} + +const char* +impl::argv_array::operator[](int idx) + const +{ + return m_args[idx].c_str(); +} + +impl::argv_array::const_iterator +impl::argv_array::begin(void) + const +{ + return m_args.begin(); +} + +impl::argv_array::const_iterator +impl::argv_array::end(void) + const +{ + return m_args.end(); +} + +impl::argv_array& +impl::argv_array::operator=(const argv_array& a) +{ + if (this != &a) { + m_args = a.m_args; + m_exec_argv = collection_to_argv(m_args); + } + return *this; +} + +// ------------------------------------------------------------------------ +// The "stream" types. +// ------------------------------------------------------------------------ + +impl::stream_capture::stream_capture(void) +{ + for (int i = 0; i < 2; i++) + m_pipefds[i] = -1; +} + +impl::stream_capture::~stream_capture(void) +{ + for (int i = 0; i < 2; i++) + if (m_pipefds[i] != -1) + ::close(m_pipefds[i]); +} + +void +impl::stream_capture::prepare(void) +{ + if (pipe(m_pipefds) == -1) + throw system_error(IMPL_NAME "::stream_capture::prepare", + "Failed to create pipe", errno); +} + +int +impl::stream_capture::connect_parent(void) +{ + ::close(m_pipefds[1]); m_pipefds[1] = -1; + const int fd = m_pipefds[0]; + m_pipefds[0] = -1; + return fd; +} + +void +impl::stream_capture::connect_child(const int fd) +{ + ::close(m_pipefds[0]); m_pipefds[0] = -1; + if (m_pipefds[1] != fd) { + safe_dup(m_pipefds[1], fd); + } + m_pipefds[1] = -1; +} + +impl::stream_connect::stream_connect(const int src_fd, const int tgt_fd) : + m_src_fd(src_fd), m_tgt_fd(tgt_fd) +{ +} + +void +impl::stream_connect::prepare(void) +{ +} + +int +impl::stream_connect::connect_parent(void) +{ + return -1; +} + +void +impl::stream_connect::connect_child(const int fd ATF_DEFS_ATTRIBUTE_UNUSED) +{ + safe_dup(m_tgt_fd, m_src_fd); +} + +impl::stream_inherit::stream_inherit(void) +{ +} + +void +impl::stream_inherit::prepare(void) +{ +} + +int +impl::stream_inherit::connect_parent(void) +{ + return -1; +} + +void +impl::stream_inherit::connect_child(const int fd ATF_DEFS_ATTRIBUTE_UNUSED) +{ +} + +impl::stream_redirect_fd::stream_redirect_fd(const int fd) : + m_fd(fd) +{ +} + +void +impl::stream_redirect_fd::prepare(void) +{ +} + +int +impl::stream_redirect_fd::connect_parent(void) +{ + return -1; +} + +void +impl::stream_redirect_fd::connect_child(const int fd) +{ + safe_dup(m_fd, fd); +} + +impl::stream_redirect_path::stream_redirect_path(const tools::fs::path& p) : + m_path(p) +{ +} + +void +impl::stream_redirect_path::prepare(void) +{ +} + +int +impl::stream_redirect_path::connect_parent(void) +{ + return -1; +} + +void +impl::stream_redirect_path::connect_child(const int fd) +{ + const int aux = ::open(m_path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (aux == -1) + throw system_error(IMPL_NAME "::stream_redirect_path::connect_child", + "Could not create " + m_path.str(), errno); + else + safe_dup(aux, fd); +} + +// ------------------------------------------------------------------------ +// The "status" type. +// ------------------------------------------------------------------------ + +impl::status::status(int s) : + m_status(s) +{ +} + +impl::status::~status(void) +{ +} + +bool +impl::status::exited(void) + const +{ + int mutable_status = m_status; + return WIFEXITED(mutable_status); +} + +int +impl::status::exitstatus(void) + const +{ + assert(exited()); + int mutable_status = m_status; + return WEXITSTATUS(mutable_status); +} + +bool +impl::status::signaled(void) + const +{ + int mutable_status = m_status; + return WIFSIGNALED(mutable_status); +} + +int +impl::status::termsig(void) + const +{ + assert(signaled()); + int mutable_status = m_status; + return WTERMSIG(mutable_status); +} + +bool +impl::status::coredump(void) + const +{ + assert(signaled()); +#if defined(WCOREDUMP) + int mutable_status = m_status; + return WCOREDUMP(mutable_status); +#else + return false; +#endif +} + +// ------------------------------------------------------------------------ +// The "child" type. +// ------------------------------------------------------------------------ + +impl::child::child(const pid_t pid_arg, const int stdout_fd_arg, + const int stderr_fd_arg) : + m_pid(pid_arg), + m_stdout(stdout_fd_arg), + m_stderr(stderr_fd_arg), + m_waited(false) +{ +} + +impl::child::~child(void) +{ + if (!m_waited) { + ::kill(m_pid, SIGTERM); + (void)wait(); + + if (m_stdout != -1) + ::close(m_stdout); + if (m_stderr != -1) + ::close(m_stderr); + } +} + +impl::status +impl::child::wait(void) +{ + int s; + + if (::waitpid(m_pid, &s, 0) == -1) + throw system_error(IMPL_NAME "::child::wait", "Failed waiting for " + "process " + text::to_string(m_pid), errno); + + if (m_stdout != -1) + ::close(m_stdout); m_stdout = -1; + if (m_stderr != -1) + ::close(m_stderr); m_stderr = -1; + + m_waited = true; + return status(s); +} + +pid_t +impl::child::pid(void) + const +{ + return m_pid; +} + +int +impl::child::stdout_fd(void) +{ + return m_stdout; +} + +int +impl::child::stderr_fd(void) +{ + return m_stderr; +} + +// ------------------------------------------------------------------------ +// Free functions. +// ------------------------------------------------------------------------ + +void +detail::flush_streams(void) +{ + // This is a weird hack to ensure that the output of the parent process + // is flushed before executing a child which prevents, for example, the + // output of the atf-run hooks to appear before the output of atf-run + // itself. + // + // TODO: This should only be executed when inheriting the stdout or + // stderr file descriptors. However, the flushing is specific to the + // iostreams, so we cannot do it from the C library where all the process + // logic is performed. Come up with a better design. + std::cout.flush(); + std::cerr.flush(); +} diff --git a/tools/process.hpp b/tools/process.hpp new file mode 100644 index 000000000000..2ebd865a8d3f --- /dev/null +++ b/tools/process.hpp @@ -0,0 +1,324 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2008 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if !defined(TOOLS_PROCESS_HPP) +#define TOOLS_PROCESS_HPP + +extern "C" { +#include + +#include +} + +#include +#include +#include +#include +#include + +#include "auto_array.hpp" +#include "exceptions.hpp" +#include "fs.hpp" + +namespace tools { +namespace process { + +class child; +class status; + +// ------------------------------------------------------------------------ +// The "argv_array" type. +// ------------------------------------------------------------------------ + +class argv_array { + typedef std::vector< std::string > args_vector; + args_vector m_args; + + // TODO: This is immutable, so we should be able to use + // std::tr1::shared_array instead when it becomes widely available. + // The reason would be to remove all copy constructors and assignment + // operators from this class. + auto_array< const char* > m_exec_argv; + void ctor_init_exec_argv(void); + +public: + typedef args_vector::const_iterator const_iterator; + typedef args_vector::size_type size_type; + + argv_array(void); + argv_array(const char*, ...); + explicit argv_array(const char* const*); + template< class C > explicit argv_array(const C&); + argv_array(const argv_array&); + + const char* const* exec_argv(void) const; + size_type size(void) const; + const char* operator[](int) const; + + const_iterator begin(void) const; + const_iterator end(void) const; + + argv_array& operator=(const argv_array&); +}; + +template< class C > +argv_array::argv_array(const C& c) +{ + for (typename C::const_iterator iter = c.begin(); iter != c.end(); + iter++) + m_args.push_back(*iter); + ctor_init_exec_argv(); +} + +// ------------------------------------------------------------------------ +// The "stream" types. +// ------------------------------------------------------------------------ + +class stream_capture { + int m_pipefds[2]; + + // Allow access to the getters. + template< class OutStream, class ErrStream > friend + child fork(void (*)(void*), OutStream, ErrStream, void*); + template< class OutStream, class ErrStream > friend + status exec(const tools::fs::path&, const argv_array&, + const OutStream&, const ErrStream&, void (*)(void)); + + void prepare(void); + int connect_parent(void); + void connect_child(const int); + +public: + stream_capture(void); + ~stream_capture(void); +}; + +class stream_connect { + int m_src_fd; + int m_tgt_fd; + + // Allow access to the getters. + template< class OutStream, class ErrStream > friend + child fork(void (*)(void*), OutStream, ErrStream, void*); + template< class OutStream, class ErrStream > friend + status exec(const tools::fs::path&, const argv_array&, + const OutStream&, const ErrStream&, void (*)(void)); + + void prepare(void); + int connect_parent(void); + void connect_child(const int); + +public: + stream_connect(const int, const int); +}; + +class stream_inherit { + // Allow access to the getters. + template< class OutStream, class ErrStream > friend + child fork(void (*)(void*), OutStream, ErrStream, void*); + template< class OutStream, class ErrStream > friend + status exec(const tools::fs::path&, const argv_array&, + const OutStream&, const ErrStream&, void (*)(void)); + + void prepare(void); + int connect_parent(void); + void connect_child(const int); + +public: + stream_inherit(void); +}; + +class stream_redirect_fd { + int m_fd; + + // Allow access to the getters. + template< class OutStream, class ErrStream > friend + child fork(void (*)(void*), OutStream, ErrStream, void*); + template< class OutStream, class ErrStream > friend + status exec(const tools::fs::path&, const argv_array&, + const OutStream&, const ErrStream&, void (*)(void)); + + void prepare(void); + int connect_parent(void); + void connect_child(const int); + +public: + stream_redirect_fd(const int); +}; + +class stream_redirect_path { + const tools::fs::path m_path; + + // Allow access to the getters. + template< class OutStream, class ErrStream > friend + child fork(void (*)(void*), OutStream, ErrStream, void*); + template< class OutStream, class ErrStream > friend + status exec(const tools::fs::path&, const argv_array&, + const OutStream&, const ErrStream&, void (*)(void)); + + void prepare(void); + int connect_parent(void); + void connect_child(const int); + +public: + stream_redirect_path(const tools::fs::path&); +}; + +// ------------------------------------------------------------------------ +// The "status" type. +// ------------------------------------------------------------------------ + +class status { + int m_status; + + friend class child; + template< class OutStream, class ErrStream > friend + status exec(const tools::fs::path&, const argv_array&, + const OutStream&, const ErrStream&, void (*)(void)); + + status(int); + +public: + ~status(void); + + bool exited(void) const; + int exitstatus(void) const; + + bool signaled(void) const; + int termsig(void) const; + bool coredump(void) const; +}; + +// ------------------------------------------------------------------------ +// The "child" type. +// ------------------------------------------------------------------------ + +class child { + pid_t m_pid; + + int m_stdout; + int m_stderr; + + bool m_waited; + + template< class OutStream, class ErrStream > friend + child fork(void (*)(void*), OutStream, ErrStream, void*); + + child(const pid_t, const int, const int); + +public: + ~child(void); + + status wait(void); + + pid_t pid(void) const; + int stdout_fd(void); + int stderr_fd(void); +}; + +// ------------------------------------------------------------------------ +// Free functions. +// ------------------------------------------------------------------------ + +namespace detail { +void flush_streams(void); + +struct exec_args { + const tools::fs::path m_prog; + const argv_array& m_argv; + void (*m_prehook)(void); +}; + +void do_exec(void *); +} // namespace detail + +// TODO: The void* cookie can probably be templatized, thus also allowing +// const data structures. +template< class OutStream, class ErrStream > +child +fork(void (*start)(void*), OutStream outsb, ErrStream errsb, void* v) +{ + detail::flush_streams(); + + outsb.prepare(); + errsb.prepare(); + + pid_t pid = ::fork(); + if (pid == -1) { + throw system_error("tools::process::child::fork", + "Failed to fork", errno); + } else if (pid == 0) { + try { + outsb.connect_child(STDOUT_FILENO); + errsb.connect_child(STDERR_FILENO); + start(v); + std::abort(); + } catch (...) { + std::cerr << "Unhandled error while running subprocess\n"; + std::exit(EXIT_FAILURE); + } + } else { + const int stdout_fd = outsb.connect_parent(); + const int stderr_fd = errsb.connect_parent(); + return child(pid, stdout_fd, stderr_fd); + } +} + +template< class OutStream, class ErrStream > +status +exec(const tools::fs::path& prog, const argv_array& argv, + const OutStream& outsb, const ErrStream& errsb, + void (*prehook)(void)) +{ + struct detail::exec_args ea = { prog, argv, prehook }; + child c = fork(detail::do_exec, outsb, errsb, &ea); + +again: + try { + return c.wait(); + } catch (const system_error& e) { + if (e.code() == EINTR) + goto again; + else + throw e; + } +} + +template< class OutStream, class ErrStream > +status +exec(const tools::fs::path& prog, const argv_array& argv, + const OutStream& outsb, const ErrStream& errsb) +{ + return exec(prog, argv, outsb, errsb, NULL); +} + +} // namespace process +} // namespace tools + +#endif // !defined(TOOLS_PROCESS_HPP) diff --git a/tools/process_helpers.c b/tools/process_helpers.c new file mode 100644 index 000000000000..61f1b67c980e --- /dev/null +++ b/tools/process_helpers.c @@ -0,0 +1,117 @@ +/* + * Automated Testing Framework (atf) + * + * Copyright (c) 2008 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND + * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +#include /* NO_CHECK_STYLE */ +#include +#include +#include +#include +#include + +static +int +h_echo(const char *msg) +{ + printf("%s\n", msg); + return EXIT_SUCCESS; +} + +static +int +h_exit_failure(void) +{ + return EXIT_FAILURE; +} + +static +int +h_exit_signal(void) +{ + kill(getpid(), SIGKILL); + assert(0); /* NO_CHECK_STYLE */ + return EXIT_FAILURE; +} + +static +int +h_exit_success(void) +{ + return EXIT_SUCCESS; +} + +static +int +h_stdout_stderr(const char *id) +{ + fprintf(stdout, "Line 1 to stdout for %s\n", id); + fprintf(stdout, "Line 2 to stdout for %s\n", id); + fprintf(stderr, "Line 1 to stderr for %s\n", id); + fprintf(stderr, "Line 2 to stderr for %s\n", id); + + return EXIT_SUCCESS; +} + +static +void +check_args(const int argc, const char *const argv[], const int required) +{ + if (argc < required) { + fprintf(stderr, "Usage: %s helper-name [args]\n", argv[0]); + exit(EXIT_FAILURE); + } +} + +int +main(int argc, const char *const argv[]) +{ + int exitcode; + + check_args(argc, argv, 2); + + if (strcmp(argv[1], "echo") == 0) { + check_args(argc, argv, 3); + exitcode = h_echo(argv[2]); + } else if (strcmp(argv[1], "exit-failure") == 0) + exitcode = h_exit_failure(); + else if (strcmp(argv[1], "exit-signal") == 0) + exitcode = h_exit_signal(); + else if (strcmp(argv[1], "exit-success") == 0) + exitcode = h_exit_success(); + else if (strcmp(argv[1], "stdout-stderr") == 0) { + check_args(argc, argv, 3); + exitcode = h_stdout_stderr(argv[2]); + } else { + fprintf(stderr, "%s: Unknown helper %s\n", argv[0], argv[1]); + exitcode = EXIT_FAILURE; + } + + return exitcode; +} diff --git a/tools/process_test.cpp b/tools/process_test.cpp new file mode 100644 index 000000000000..70da919dd0eb --- /dev/null +++ b/tools/process_test.cpp @@ -0,0 +1,360 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2008 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#include +#include + +#include + +#include "process.hpp" +#include "test_helpers.hpp" + +// TODO: Testing the fork function is a huge task and I'm afraid of +// copy/pasting tons of stuff from the C version. I'd rather not do that +// until some code can be shared, which cannot happen until the C++ binding +// is cleaned by a fair amount. Instead... just rely (at the moment) on +// the system tests for the tools using this module. + +// ------------------------------------------------------------------------ +// Auxiliary functions. +// ------------------------------------------------------------------------ + +static +std::size_t +array_size(const char* const* array) +{ + std::size_t size = 0; + + for (const char* const* ptr = array; *ptr != NULL; ptr++) + size++; + + return size; +} + +static +tools::process::status +exec_process_helpers(const atf::tests::tc& tc, const char* helper_name) +{ + using tools::process::exec; + + const tools::fs::path helpers = tools::fs::path(tc.get_config_var("srcdir")) / + "process_helpers"; + + std::vector< std::string > argv; + argv.push_back(helpers.leaf_name()); + argv.push_back(helper_name); + + return exec(helpers, + tools::process::argv_array(argv), + tools::process::stream_inherit(), + tools::process::stream_inherit()); +} + +// ------------------------------------------------------------------------ +// Tests for the "argv_array" type. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(argv_array_init_carray); +ATF_TEST_CASE_HEAD(argv_array_init_carray) +{ + set_md_var("descr", "Tests that argv_array is correctly constructed " + "from a C-style array of strings"); +} +ATF_TEST_CASE_BODY(argv_array_init_carray) +{ + { + const char* const carray[] = { NULL }; + tools::process::argv_array argv(carray); + + ATF_REQUIRE_EQ(argv.size(), 0); + } + + { + const char* const carray[] = { "arg0", NULL }; + tools::process::argv_array argv(carray); + + ATF_REQUIRE_EQ(argv.size(), 1); + ATF_REQUIRE(std::strcmp(argv[0], carray[0]) == 0); + } + + { + const char* const carray[] = { "arg0", "arg1", "arg2", NULL }; + tools::process::argv_array argv(carray); + + ATF_REQUIRE_EQ(argv.size(), 3); + ATF_REQUIRE(std::strcmp(argv[0], carray[0]) == 0); + ATF_REQUIRE(std::strcmp(argv[1], carray[1]) == 0); + ATF_REQUIRE(std::strcmp(argv[2], carray[2]) == 0); + } +} + +ATF_TEST_CASE(argv_array_init_col); +ATF_TEST_CASE_HEAD(argv_array_init_col) +{ + set_md_var("descr", "Tests that argv_array is correctly constructed " + "from a string collection"); +} +ATF_TEST_CASE_BODY(argv_array_init_col) +{ + { + std::vector< std::string > col; + tools::process::argv_array argv(col); + + ATF_REQUIRE_EQ(argv.size(), 0); + } + + { + std::vector< std::string > col; + col.push_back("arg0"); + tools::process::argv_array argv(col); + + ATF_REQUIRE_EQ(argv.size(), 1); + ATF_REQUIRE_EQ(argv[0], col[0]); + } + + { + std::vector< std::string > col; + col.push_back("arg0"); + col.push_back("arg1"); + col.push_back("arg2"); + tools::process::argv_array argv(col); + + ATF_REQUIRE_EQ(argv.size(), 3); + ATF_REQUIRE_EQ(argv[0], col[0]); + ATF_REQUIRE_EQ(argv[1], col[1]); + ATF_REQUIRE_EQ(argv[2], col[2]); + } +} + +ATF_TEST_CASE(argv_array_init_empty); +ATF_TEST_CASE_HEAD(argv_array_init_empty) +{ + set_md_var("descr", "Tests that argv_array is correctly constructed " + "by the default constructor"); +} +ATF_TEST_CASE_BODY(argv_array_init_empty) +{ + tools::process::argv_array argv; + + ATF_REQUIRE_EQ(argv.size(), 0); +} + +ATF_TEST_CASE(argv_array_init_varargs); +ATF_TEST_CASE_HEAD(argv_array_init_varargs) +{ + set_md_var("descr", "Tests that argv_array is correctly constructed " + "from a variable list of arguments"); +} +ATF_TEST_CASE_BODY(argv_array_init_varargs) +{ + { + tools::process::argv_array argv("arg0", NULL); + + ATF_REQUIRE_EQ(argv.size(), 1); + ATF_REQUIRE_EQ(argv[0], std::string("arg0")); + } + + { + tools::process::argv_array argv("arg0", "arg1", "arg2", NULL); + + ATF_REQUIRE_EQ(argv.size(), 3); + ATF_REQUIRE_EQ(argv[0], std::string("arg0")); + ATF_REQUIRE_EQ(argv[1], std::string("arg1")); + ATF_REQUIRE_EQ(argv[2], std::string("arg2")); + } +} + +ATF_TEST_CASE(argv_array_assign); +ATF_TEST_CASE_HEAD(argv_array_assign) +{ + set_md_var("descr", "Tests that assigning an argv_array works"); +} +ATF_TEST_CASE_BODY(argv_array_assign) +{ + using tools::process::argv_array; + + const char* const carray1[] = { "arg1", NULL }; + const char* const carray2[] = { "arg1", "arg2", NULL }; + + std::auto_ptr< argv_array > argv1(new argv_array(carray1)); + std::auto_ptr< argv_array > argv2(new argv_array(carray2)); + + *argv2 = *argv1; + ATF_REQUIRE_EQ(argv2->size(), argv1->size()); + ATF_REQUIRE(std::strcmp((*argv2)[0], (*argv1)[0]) == 0); + + ATF_REQUIRE(argv2->exec_argv() != argv1->exec_argv()); + argv1.release(); + { + const char* const* eargv2 = argv2->exec_argv(); + ATF_REQUIRE(std::strcmp(eargv2[0], carray1[0]) == 0); + ATF_REQUIRE_EQ(eargv2[1], static_cast< const char* >(NULL)); + } + + argv2.release(); +} + +ATF_TEST_CASE(argv_array_copy); +ATF_TEST_CASE_HEAD(argv_array_copy) +{ + set_md_var("descr", "Tests that copying an argv_array constructed from " + "a C-style array of strings works"); +} +ATF_TEST_CASE_BODY(argv_array_copy) +{ + using tools::process::argv_array; + + const char* const carray[] = { "arg0", NULL }; + + std::auto_ptr< argv_array > argv1(new argv_array(carray)); + std::auto_ptr< argv_array > argv2(new argv_array(*argv1)); + + ATF_REQUIRE_EQ(argv2->size(), argv1->size()); + ATF_REQUIRE(std::strcmp((*argv2)[0], (*argv1)[0]) == 0); + + ATF_REQUIRE(argv2->exec_argv() != argv1->exec_argv()); + argv1.release(); + { + const char* const* eargv2 = argv2->exec_argv(); + ATF_REQUIRE(std::strcmp(eargv2[0], carray[0]) == 0); + ATF_REQUIRE_EQ(eargv2[1], static_cast< const char* >(NULL)); + } + + argv2.release(); +} + +ATF_TEST_CASE(argv_array_exec_argv); +ATF_TEST_CASE_HEAD(argv_array_exec_argv) +{ + set_md_var("descr", "Tests that the exec argv provided by an argv_array " + "is correct"); +} +ATF_TEST_CASE_BODY(argv_array_exec_argv) +{ + using tools::process::argv_array; + + { + argv_array argv; + const char* const* eargv = argv.exec_argv(); + ATF_REQUIRE_EQ(array_size(eargv), 0); + ATF_REQUIRE_EQ(eargv[0], static_cast< const char* >(NULL)); + } + + { + const char* const carray[] = { "arg0", NULL }; + argv_array argv(carray); + const char* const* eargv = argv.exec_argv(); + ATF_REQUIRE_EQ(array_size(eargv), 1); + ATF_REQUIRE(std::strcmp(eargv[0], "arg0") == 0); + ATF_REQUIRE_EQ(eargv[1], static_cast< const char* >(NULL)); + } + + { + std::vector< std::string > col; + col.push_back("arg0"); + argv_array argv(col); + const char* const* eargv = argv.exec_argv(); + ATF_REQUIRE_EQ(array_size(eargv), 1); + ATF_REQUIRE(std::strcmp(eargv[0], "arg0") == 0); + ATF_REQUIRE_EQ(eargv[1], static_cast< const char* >(NULL)); + } +} + +ATF_TEST_CASE(argv_array_iter); +ATF_TEST_CASE_HEAD(argv_array_iter) +{ + set_md_var("descr", "Tests that an argv_array can be iterated"); +} +ATF_TEST_CASE_BODY(argv_array_iter) +{ + using tools::process::argv_array; + + std::vector< std::string > vector; + vector.push_back("arg0"); + vector.push_back("arg1"); + vector.push_back("arg2"); + + argv_array argv(vector); + ATF_REQUIRE_EQ(argv.size(), 3); + std::vector< std::string >::size_type pos = 0; + for (argv_array::const_iterator iter = argv.begin(); iter != argv.end(); + iter++) { + ATF_REQUIRE_EQ(*iter, vector[pos]); + pos++; + } +} + +// ------------------------------------------------------------------------ +// Tests cases for the free functions. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(exec_failure); +ATF_TEST_CASE_HEAD(exec_failure) +{ + set_md_var("descr", "Tests execing a command that reports failure"); +} +ATF_TEST_CASE_BODY(exec_failure) +{ + const tools::process::status s = exec_process_helpers(*this, "exit-failure"); + ATF_REQUIRE(s.exited()); + ATF_REQUIRE_EQ(s.exitstatus(), EXIT_FAILURE); +} + +ATF_TEST_CASE(exec_success); +ATF_TEST_CASE_HEAD(exec_success) +{ + set_md_var("descr", "Tests execing a command that reports success"); +} +ATF_TEST_CASE_BODY(exec_success) +{ + const tools::process::status s = exec_process_helpers(*this, "exit-success"); + ATF_REQUIRE(s.exited()); + ATF_REQUIRE_EQ(s.exitstatus(), EXIT_SUCCESS); +} + +// ------------------------------------------------------------------------ +// Main. +// ------------------------------------------------------------------------ + +ATF_INIT_TEST_CASES(tcs) +{ + // Add the test cases for the "argv_array" type. + ATF_ADD_TEST_CASE(tcs, argv_array_assign); + ATF_ADD_TEST_CASE(tcs, argv_array_copy); + ATF_ADD_TEST_CASE(tcs, argv_array_exec_argv); + ATF_ADD_TEST_CASE(tcs, argv_array_init_carray); + ATF_ADD_TEST_CASE(tcs, argv_array_init_col); + ATF_ADD_TEST_CASE(tcs, argv_array_init_empty); + ATF_ADD_TEST_CASE(tcs, argv_array_init_varargs); + ATF_ADD_TEST_CASE(tcs, argv_array_iter); + + // Add the test cases for the free functions. + ATF_ADD_TEST_CASE(tcs, exec_failure); + ATF_ADD_TEST_CASE(tcs, exec_success); +} diff --git a/atf-report/reader.cpp b/tools/reader.cpp similarity index 78% rename from atf-report/reader.cpp rename to tools/reader.cpp index 8f5fde791c8a..67fce662a192 100644 --- a/atf-report/reader.cpp +++ b/tools/reader.cpp @@ -31,20 +31,19 @@ extern "C" { #include } +#include +#include #include #include #include -#include "atf-c/defs.h" - -#include "atf-c++/detail/parser.hpp" -#include "atf-c++/detail/sanity.hpp" -#include "atf-c++/detail/text.hpp" - +#include "defs.hpp" +#include "parser.hpp" #include "reader.hpp" +#include "text.hpp" -namespace impl = atf::atf_report; -#define IMPL_NAME "atf::atf_report" +namespace impl = tools::atf_report; +#define IMPL_NAME "tools::atf_report" // ------------------------------------------------------------------------ // Auxiliary functions. @@ -67,32 +66,32 @@ string_to_int(const std::string& str) namespace atf_tps { -static const atf::parser::token_type eof_type = 0; -static const atf::parser::token_type nl_type = 1; -static const atf::parser::token_type text_type = 2; -static const atf::parser::token_type colon_type = 3; -static const atf::parser::token_type comma_type = 4; -static const atf::parser::token_type tps_count_type = 5; -static const atf::parser::token_type tp_start_type = 6; -static const atf::parser::token_type tp_end_type = 7; -static const atf::parser::token_type tc_start_type = 8; -static const atf::parser::token_type tc_so_type = 9; -static const atf::parser::token_type tc_se_type = 10; -static const atf::parser::token_type tc_end_type = 11; -static const atf::parser::token_type passed_type = 12; -static const atf::parser::token_type failed_type = 13; -static const atf::parser::token_type skipped_type = 14; -static const atf::parser::token_type info_type = 16; -static const atf::parser::token_type expected_death_type = 17; -static const atf::parser::token_type expected_exit_type = 18; -static const atf::parser::token_type expected_failure_type = 19; -static const atf::parser::token_type expected_signal_type = 20; -static const atf::parser::token_type expected_timeout_type = 21; +static const tools::parser::token_type eof_type = 0; +static const tools::parser::token_type nl_type = 1; +static const tools::parser::token_type text_type = 2; +static const tools::parser::token_type colon_type = 3; +static const tools::parser::token_type comma_type = 4; +static const tools::parser::token_type tps_count_type = 5; +static const tools::parser::token_type tp_start_type = 6; +static const tools::parser::token_type tp_end_type = 7; +static const tools::parser::token_type tc_start_type = 8; +static const tools::parser::token_type tc_so_type = 9; +static const tools::parser::token_type tc_se_type = 10; +static const tools::parser::token_type tc_end_type = 11; +static const tools::parser::token_type passed_type = 12; +static const tools::parser::token_type failed_type = 13; +static const tools::parser::token_type skipped_type = 14; +static const tools::parser::token_type info_type = 16; +static const tools::parser::token_type expected_death_type = 17; +static const tools::parser::token_type expected_exit_type = 18; +static const tools::parser::token_type expected_failure_type = 19; +static const tools::parser::token_type expected_signal_type = 20; +static const tools::parser::token_type expected_timeout_type = 21; -class tokenizer : public atf::parser::tokenizer< std::istream > { +class tokenizer : public tools::parser::tokenizer< std::istream > { public: tokenizer(std::istream& is, size_t curline) : - atf::parser::tokenizer< std::istream > + tools::parser::tokenizer< std::istream > (is, true, eof_type, nl_type, text_type, curline) { add_delim(':', colon_type); @@ -119,15 +118,15 @@ class tokenizer : public atf::parser::tokenizer< std::istream > { } // namespace atf_tps struct timeval -read_timeval(atf::parser::parser< atf_tps::tokenizer >& parser) +read_timeval(tools::parser::parser< atf_tps::tokenizer >& parser) { using namespace atf_tps; - atf::parser::token t = parser.expect(text_type, "timestamp"); + tools::parser::token t = parser.expect(text_type, "timestamp"); const std::string::size_type divider = t.text().find('.'); if (divider == std::string::npos || divider == 0 || divider == t.text().length() - 1) - throw atf::parser::parse_error(t.lineno(), + throw tools::parser::parse_error(t.lineno(), "Malformed timestamp value " + t.text()); struct timeval tv; @@ -209,18 +208,18 @@ impl::atf_tps_reader::got_eof(void) void impl::atf_tps_reader::read_info(void* pptr) { - using atf::parser::parse_error; + using tools::parser::parse_error; using namespace atf_tps; - atf::parser::parser< tokenizer >& p = - *reinterpret_cast< atf::parser::parser< tokenizer >* > + tools::parser::parser< tokenizer >& p = + *reinterpret_cast< tools::parser::parser< tokenizer >* > (pptr); (void)p.expect(colon_type, "`:'"); - atf::parser::token t = p.expect(text_type, "info property name"); + tools::parser::token t = p.expect(text_type, "info property name"); (void)p.expect(comma_type, "`,'"); - got_info(t.text(), atf::text::trim(p.rest_of_line())); + got_info(t.text(), tools::text::trim(p.rest_of_line())); (void)p.expect(nl_type, "new line"); } @@ -228,14 +227,14 @@ impl::atf_tps_reader::read_info(void* pptr) void impl::atf_tps_reader::read_tp(void* pptr) { - using atf::parser::parse_error; + using tools::parser::parse_error; using namespace atf_tps; - atf::parser::parser< tokenizer >& p = - *reinterpret_cast< atf::parser::parser< tokenizer >* > + tools::parser::parser< tokenizer >& p = + *reinterpret_cast< tools::parser::parser< tokenizer >* > (pptr); - atf::parser::token t = p.expect(tp_start_type, + tools::parser::token t = p.expect(tp_start_type, "start of test program"); t = p.expect(colon_type, "`:'"); @@ -287,7 +286,7 @@ impl::atf_tps_reader::read_tp(void* pptr) "new line or comma_type"); std::string reason; if (t.type() == comma_type) { - reason = text::trim(p.rest_of_line()); + reason = tools::text::trim(p.rest_of_line()); if (reason.empty()) throw parse_error(t.lineno(), "Empty reason for failed test program"); @@ -300,14 +299,14 @@ impl::atf_tps_reader::read_tp(void* pptr) void impl::atf_tps_reader::read_tc(void* pptr) { - using atf::parser::parse_error; + using tools::parser::parse_error; using namespace atf_tps; - atf::parser::parser< tokenizer >& p = - *reinterpret_cast< atf::parser::parser< tokenizer >* > + tools::parser::parser< tokenizer >& p = + *reinterpret_cast< tools::parser::parser< tokenizer >* > (pptr); - atf::parser::token t = p.expect(tc_start_type, "start of test case"); + tools::parser::token t = p.expect(tc_start_type, "start of test case"); t = p.expect(colon_type, "`:'"); @@ -326,7 +325,7 @@ impl::atf_tps_reader::read_tc(void* pptr) "end of test case or test case's stdout/stderr line"); while (t.type() != tc_end_type && (t.type() == tc_so_type || t.type() == tc_se_type)) { - atf::parser::token t2 = t; + tools::parser::token t2 = t; t = p.expect(colon_type, "`:'"); @@ -335,7 +334,7 @@ impl::atf_tps_reader::read_tc(void* pptr) if (t2.type() == tc_so_type) { ATF_PARSER_CALLBACK(p, got_tc_stdout_line(line)); } else { - INV(t2.type() == tc_se_type); + assert(t2.type() == tc_se_type); ATF_PARSER_CALLBACK(p, got_tc_stderr_line(line)); } @@ -377,10 +376,10 @@ impl::atf_tps_reader::read_tc(void* pptr) else if (t.type() == expected_timeout_type) state = "expected_timeout"; else if (t.type() == failed_type) state = "failed"; else if (t.type() == skipped_type) state = "skipped"; - else UNREACHABLE; + else std::abort(); t = p.expect(comma_type, "`,'"); - std::string reason = text::trim(p.rest_of_line()); + std::string reason = tools::text::trim(p.rest_of_line()); if (reason.empty()) throw parse_error(t.lineno(), "Empty reason for " + state + " test case result"); @@ -393,18 +392,19 @@ impl::atf_tps_reader::read_tc(void* pptr) void impl::atf_tps_reader::read(void) { - using atf::parser::parse_error; + using tools::parser::parse_error; using namespace atf_tps; - std::pair< size_t, atf::parser::headers_map > hml = - atf::parser::read_headers(m_is, 1); - atf::parser::validate_content_type(hml.second, "application/X-atf-tps", 3); + std::pair< size_t, tools::parser::headers_map > hml = + tools::parser::read_headers(m_is, 1); + tools::parser::validate_content_type(hml.second, + "application/X-atf-tps", 3); tokenizer tkz(m_is, hml.first); - atf::parser::parser< tokenizer > p(tkz); + tools::parser::parser< tokenizer > p(tkz); try { - atf::parser::token t; + tools::parser::token t; while ((t = p.expect(tps_count_type, info_type, "tps-count or info " "field")).type() == info_type) diff --git a/atf-report/reader.hpp b/tools/reader.hpp similarity index 93% rename from atf-report/reader.hpp rename to tools/reader.hpp index 2ef038a0de4f..34d5d25f01f9 100644 --- a/atf-report/reader.hpp +++ b/tools/reader.hpp @@ -27,8 +27,8 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_REPORT_FORMATS_HPP_) -#define _ATF_REPORT_FORMATS_HPP_ +#if !defined(TOOLS_FORMATS_HPP) +#define TOOLS_FORMATS_HPP extern "C" { #include @@ -37,9 +37,7 @@ extern "C" { #include #include -#include - -namespace atf { +namespace tools { namespace atf_report { struct test_case_result { @@ -86,6 +84,6 @@ class atf_tps_reader { }; } // namespace atf_report -} // namespace atf +} // namespace tools -#endif // !defined(_ATF_REPORT_FORMATS_HPP_) +#endif // !defined(TOOLS_FORMATS_HPP) diff --git a/atf-report/reader_test.cpp b/tools/reader_test.cpp similarity index 98% rename from atf-report/reader_test.cpp rename to tools/reader_test.cpp index 59e4059efccc..3e53e064d314 100644 --- a/atf-report/reader_test.cpp +++ b/tools/reader_test.cpp @@ -33,16 +33,14 @@ #include #include -#include "atf-c++/macros.hpp" - -#include "atf-c++/detail/parser.hpp" -#include "atf-c++/detail/sanity.hpp" -#include "atf-c++/detail/test_helpers.hpp" -#include "atf-c++/detail/text.hpp" +#include +#include "parser.hpp" #include "reader.hpp" +#include "test_helpers.hpp" +#include "text.hpp" -namespace impl = atf::atf_report; +namespace impl = tools::atf_report; class tps_reader : protected impl::atf_tps_reader { void @@ -54,14 +52,14 @@ class tps_reader : protected impl::atf_tps_reader { void got_ntps(size_t ntps) { - m_calls.push_back("got_ntps(" + atf::text::to_string(ntps) + ")"); + m_calls.push_back("got_ntps(" + tools::text::to_string(ntps) + ")"); } void got_tp_start(const std::string& tpname, size_t ntcs) { m_calls.push_back("got_tp_start(" + tpname + ", " + - atf::text::to_string(ntcs) + ")"); + tools::text::to_string(ntcs) + ")"); } void diff --git a/atf-run/requirements.cpp b/tools/requirements.cpp similarity index 75% rename from atf-run/requirements.cpp rename to tools/requirements.cpp index 2a8258dcc8fe..97fcdc8b5e8c 100644 --- a/atf-run/requirements.cpp +++ b/tools/requirements.cpp @@ -32,48 +32,46 @@ extern "C" { #include } +#include #include +#include #include #include -extern "C" { -#include "atf-c/defs.h" -} - -#include "atf-c++/config.hpp" - -#include "atf-c++/detail/fs.hpp" -#include "atf-c++/detail/env.hpp" -#include "atf-c++/detail/sanity.hpp" -#include "atf-c++/detail/text.hpp" - +#include "config.hpp" +#include "defs.hpp" +#include "env.hpp" +#include "fs.hpp" #include "requirements.hpp" +#include "text.hpp" #include "user.hpp" -namespace impl = atf::atf_run; +namespace impl = tools; namespace { +typedef std::map< std::string, std::string > vars_map; + static bool -has_program(const atf::fs::path& program) +has_program(const tools::fs::path& program) { bool found = false; if (program.is_absolute()) { - found = atf::fs::is_executable(program); + found = tools::fs::is_executable(program); } else { if (program.str().find('/') != std::string::npos) throw std::runtime_error("Relative paths are not allowed " "when searching for a program (" + program.str() + ")"); - const std::vector< std::string > dirs = atf::text::split( - atf::env::get("PATH"), ":"); + const std::vector< std::string > dirs = tools::text::split( + tools::env::get("PATH"), ":"); for (std::vector< std::string >::const_iterator iter = dirs.begin(); !found && iter != dirs.end(); iter++) { - const atf::fs::path& p = atf::fs::path(*iter) / program; - if (atf::fs::is_executable(p)) + const tools::fs::path& p = tools::fs::path(*iter) / program; + if (tools::fs::is_executable(p)) found = true; } } @@ -85,11 +83,11 @@ static std::string check_arch(const std::string& arches) { - const std::vector< std::string > v = atf::text::split(arches, " "); + const std::vector< std::string > v = tools::text::split(arches, " "); for (std::vector< std::string >::const_iterator iter = v.begin(); iter != v.end(); iter++) { - if ((*iter) == atf::config::get("atf_arch")) + if ((*iter) == tools::config::get("atf_arch")) return ""; } @@ -101,9 +99,9 @@ check_arch(const std::string& arches) static std::string -check_config(const std::string& variables, const atf::tests::vars_map& config) +check_config(const std::string& variables, const vars_map& config) { - const std::vector< std::string > v = atf::text::split(variables, " "); + const std::vector< std::string > v = tools::text::split(variables, " "); for (std::vector< std::string >::const_iterator iter = v.begin(); iter != v.end(); iter++) { if (config.find((*iter)) == config.end()) @@ -117,14 +115,14 @@ static std::string check_files(const std::string& progs) { - const std::vector< std::string > v = atf::text::split(progs, " "); + const std::vector< std::string > v = tools::text::split(progs, " "); for (std::vector< std::string >::const_iterator iter = v.begin(); iter != v.end(); iter++) { - const atf::fs::path file(*iter); + const tools::fs::path file(*iter); if (!file.is_absolute()) throw std::runtime_error("Relative paths are not allowed when " "checking for a required file (" + file.str() + ")"); - if (!atf::fs::exists(file)) + if (!tools::fs::exists(file)) return "Required file '" + file.str() + "' not found"; } return ""; @@ -134,11 +132,11 @@ static std::string check_machine(const std::string& machines) { - const std::vector< std::string > v = atf::text::split(machines, " "); + const std::vector< std::string > v = tools::text::split(machines, " "); for (std::vector< std::string >::const_iterator iter = v.begin(); iter != v.end(); iter++) { - if ((*iter) == atf::config::get("atf_machine")) + if ((*iter) == tools::config::get("atf_machine")) return ""; } @@ -162,8 +160,8 @@ check_memory_sysctl(const int64_t needed, const char* sysctl_variable) } if (available < needed) { - return "Not enough memory; needed " + atf::text::to_string(needed) + - ", available " + atf::text::to_string(available); + return "Not enough memory; needed " + tools::text::to_string(needed) + + ", available " + tools::text::to_string(available); } else return ""; } @@ -204,7 +202,7 @@ static std::string check_memory(const std::string& raw_memory) { - const int64_t needed = atf::text::to_bytes(raw_memory); + const int64_t needed = tools::text::to_bytes(raw_memory); #if defined(__APPLE__) return check_memory_darwin(needed); @@ -221,10 +219,10 @@ static std::string check_progs(const std::string& progs) { - const std::vector< std::string > v = atf::text::split(progs, " "); + const std::vector< std::string > v = tools::text::split(progs, " "); for (std::vector< std::string >::const_iterator iter = v.begin(); iter != v.end(); iter++) { - if (!has_program(atf::fs::path(*iter))) + if (!has_program(tools::fs::path(*iter))) return "Required program '" + (*iter) + "' not found in the PATH"; } return ""; @@ -232,16 +230,16 @@ check_progs(const std::string& progs) static std::string -check_user(const std::string& user, const atf::tests::vars_map& config) +check_user(const std::string& user, const vars_map& config) { if (user == "root") { - if (!impl::is_root()) + if (!tools::user::is_root()) return "Requires root privileges"; else return ""; } else if (user == "unprivileged") { - if (impl::is_root()) { - const atf::tests::vars_map::const_iterator iter = config.find( + if (tools::user::is_root()) { + const vars_map::const_iterator iter = config.find( "unprivileged-user"); if (iter == config.end()) return "Requires an unprivileged user and the " @@ -249,7 +247,7 @@ check_user(const std::string& user, const atf::tests::vars_map& config) else { const std::string& unprivileged_user = (*iter).second; try { - (void)impl::get_user_ids(unprivileged_user); + (void)tools::user::get_user_ids(unprivileged_user); return ""; } catch (const std::runtime_error& e) { return "Failed to get information for user " + @@ -266,16 +264,16 @@ check_user(const std::string& user, const atf::tests::vars_map& config) } // anonymous namespace std::string -impl::check_requirements(const atf::tests::vars_map& metadata, - const atf::tests::vars_map& config) +impl::check_requirements(const vars_map& metadata, + const vars_map& config) { std::string failure_reason = ""; - for (atf::tests::vars_map::const_iterator iter = metadata.begin(); + for (vars_map::const_iterator iter = metadata.begin(); failure_reason.empty() && iter != metadata.end(); iter++) { const std::string& name = (*iter).first; const std::string& value = (*iter).second; - INV(!value.empty()); // Enforced by application/X-atf-tp parser. + assert(!value.empty()); // Enforced by application/X-atf-tp parser. if (name == "require.arch") failure_reason = check_arch(value); @@ -294,7 +292,7 @@ impl::check_requirements(const atf::tests::vars_map& metadata, else { // Unknown require.* properties are forbidden by the // application/X-atf-tp parser. - INV(failure_reason.find("require.") != 0); + assert(failure_reason.find("require.") != 0); } } @@ -302,23 +300,22 @@ impl::check_requirements(const atf::tests::vars_map& metadata, } std::pair< int, int > -impl::get_required_user(const atf::tests::vars_map& metadata, - const atf::tests::vars_map& config) +impl::get_required_user(const vars_map& metadata, + const vars_map& config) { - const atf::tests::vars_map::const_iterator user = metadata.find( + const vars_map::const_iterator user = metadata.find( "require.user"); if (user == metadata.end()) return std::make_pair(-1, -1); if ((*user).second == "unprivileged") { - if (impl::is_root()) { - const atf::tests::vars_map::const_iterator iter = config.find( + if (tools::user::is_root()) { + const vars_map::const_iterator iter = config.find( "unprivileged-user"); try { - return impl::get_user_ids((*iter).second); + return tools::user::get_user_ids((*iter).second); } catch (const std::exception& e) { - UNREACHABLE; // This has been validated by check_user. - throw e; + std::abort(); // This has been validated by check_user. } } else { return std::make_pair(-1, -1); diff --git a/atf-run/requirements.hpp b/tools/requirements.hpp similarity index 76% rename from atf-run/requirements.hpp rename to tools/requirements.hpp index 62c072d5fac9..1eefdaf555e5 100644 --- a/atf-run/requirements.hpp +++ b/tools/requirements.hpp @@ -27,18 +27,21 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +#if !defined(TOOLS_REQUIREMENTS_HPP) +#define TOOLS_REQUIREMENTS_HPP + +#include #include #include -#include "atf-c++/tests.hpp" +namespace tools { -namespace atf { -namespace atf_run { +std::string check_requirements(const std::map< std::string, std::string >&, + const std::map< std::string, std::string >&); +std::pair< int, int > get_required_user( + const std::map< std::string, std::string >&, + const std::map< std::string, std::string >&); -std::string check_requirements(const atf::tests::vars_map&, - const atf::tests::vars_map&); -std::pair< int, int > get_required_user(const atf::tests::vars_map&, - const atf::tests::vars_map&); +} // namespace tools -} // namespace atf_run -} // namespace atf +#endif // !defined(TOOLS_REQUIREMENTS_HPP) diff --git a/atf-run/requirements_test.cpp b/tools/requirements_test.cpp similarity index 87% rename from atf-run/requirements_test.cpp rename to tools/requirements_test.cpp index 203734342095..6d37d758cb45 100644 --- a/atf-run/requirements_test.cpp +++ b/tools/requirements_test.cpp @@ -27,14 +27,14 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#include "atf-c++/config.hpp" -#include "atf-c++/detail/text.hpp" -#include "atf-c++/macros.hpp" +#include +#include "config.hpp" #include "requirements.hpp" +#include "text.hpp" #include "user.hpp" -namespace impl = atf::atf_run; +namespace impl = tools; // ------------------------------------------------------------------------- // Auxiliary functions. @@ -42,14 +42,16 @@ namespace impl = atf::atf_run; namespace { -const atf::tests::vars_map no_config; +typedef std::map< std::string, std::string > vars_map; + +const vars_map no_config; void -do_check(const std::string& expected, const atf::tests::vars_map& metadata, - const atf::tests::vars_map& config = no_config) +do_check(const std::string& expected, const vars_map& metadata, + const vars_map& config = no_config) { const std::string actual = impl::check_requirements(metadata, config); - if (!atf::text::match(actual, expected)) + if (!tools::text::match(actual, expected)) ATF_FAIL("Requirements failure reason \"" + actual + "\" does not " "match \"" + expected + "\""); } @@ -63,15 +65,15 @@ do_check(const std::string& expected, const atf::tests::vars_map& metadata, ATF_TEST_CASE(require_arch_one_ok); ATF_TEST_CASE_HEAD(require_arch_one_ok) {} ATF_TEST_CASE_BODY(require_arch_one_ok) { - atf::tests::vars_map metadata; - metadata["require.arch"] = atf::config::get("atf_arch"); + vars_map metadata; + metadata["require.arch"] = tools::config::get("atf_arch"); do_check("", metadata); } ATF_TEST_CASE(require_arch_one_fail); ATF_TEST_CASE_HEAD(require_arch_one_fail) {} ATF_TEST_CASE_BODY(require_arch_one_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.arch"] = "__fake_arch__"; do_check("Requires the '__fake_arch__' architecture", metadata); } @@ -79,8 +81,8 @@ ATF_TEST_CASE_BODY(require_arch_one_fail) { ATF_TEST_CASE(require_arch_many_ok); ATF_TEST_CASE_HEAD(require_arch_many_ok) {} ATF_TEST_CASE_BODY(require_arch_many_ok) { - atf::tests::vars_map metadata; - metadata["require.arch"] = "__foo__ " + atf::config::get("atf_arch") + + vars_map metadata; + metadata["require.arch"] = "__foo__ " + tools::config::get("atf_arch") + " __bar__"; do_check("", metadata); } @@ -88,7 +90,7 @@ ATF_TEST_CASE_BODY(require_arch_many_ok) { ATF_TEST_CASE(require_arch_many_fail); ATF_TEST_CASE_HEAD(require_arch_many_fail) {} ATF_TEST_CASE_BODY(require_arch_many_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.arch"] = "__foo__ __bar__ __baz__"; do_check("Requires one of the '__foo__ __bar__ __baz__' architectures", metadata); @@ -101,7 +103,7 @@ ATF_TEST_CASE_BODY(require_arch_many_fail) { ATF_TEST_CASE(require_config_one_ok); ATF_TEST_CASE_HEAD(require_config_one_ok) {} ATF_TEST_CASE_BODY(require_config_one_ok) { - atf::tests::vars_map metadata, config; + vars_map metadata, config; metadata["require.config"] = "var1"; config["var1"] = "some-value"; do_check("", metadata, config); @@ -110,7 +112,7 @@ ATF_TEST_CASE_BODY(require_config_one_ok) { ATF_TEST_CASE(require_config_one_fail); ATF_TEST_CASE_HEAD(require_config_one_fail) {} ATF_TEST_CASE_BODY(require_config_one_fail) { - atf::tests::vars_map metadata, config; + vars_map metadata, config; metadata["require.config"] = "var1"; do_check("Required configuration variable 'var1' not defined", metadata, config); @@ -119,7 +121,7 @@ ATF_TEST_CASE_BODY(require_config_one_fail) { ATF_TEST_CASE(require_config_many_ok); ATF_TEST_CASE_HEAD(require_config_many_ok) {} ATF_TEST_CASE_BODY(require_config_many_ok) { - atf::tests::vars_map metadata, config; + vars_map metadata, config; metadata["require.config"] = "var1 var2 var3"; config["var1"] = "first-value"; config["var2"] = "second-value"; @@ -130,7 +132,7 @@ ATF_TEST_CASE_BODY(require_config_many_ok) { ATF_TEST_CASE(require_config_many_fail); ATF_TEST_CASE_HEAD(require_config_many_fail) {} ATF_TEST_CASE_BODY(require_config_many_fail) { - atf::tests::vars_map metadata, config; + vars_map metadata, config; metadata["require.config"] = "var1 var2 var3"; config["var1"] = "first-value"; config["var3"] = "third-value"; @@ -144,21 +146,21 @@ ATF_TEST_CASE_BODY(require_config_many_fail) { ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_ok); ATF_TEST_CASE_BODY(require_files_one_ok) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.files"] = "/bin/ls"; do_check("", metadata); } ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_missing); ATF_TEST_CASE_BODY(require_files_one_missing) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.files"] = "/non-existent/foo"; do_check("Required file '/non-existent/foo' not found", metadata); } ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_fail); ATF_TEST_CASE_BODY(require_files_one_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.files"] = "/bin/cp this-is-relative"; ATF_REQUIRE_THROW_RE(std::runtime_error, "Relative.*(this-is-relative)", impl::check_requirements(metadata, no_config)); @@ -166,21 +168,21 @@ ATF_TEST_CASE_BODY(require_files_one_fail) { ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_ok); ATF_TEST_CASE_BODY(require_files_many_ok) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.files"] = "/bin/ls /bin/cp"; do_check("", metadata); } ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_missing); ATF_TEST_CASE_BODY(require_files_many_missing) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.files"] = "/bin/ls /non-existent/bar /bin/cp"; do_check("Required file '/non-existent/bar' not found", metadata); } ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_fail); ATF_TEST_CASE_BODY(require_files_many_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.files"] = "/bin/cp also-relative"; ATF_REQUIRE_THROW_RE(std::runtime_error, "Relative.*(also-relative)", impl::check_requirements(metadata, no_config)); @@ -193,15 +195,15 @@ ATF_TEST_CASE_BODY(require_files_many_fail) { ATF_TEST_CASE(require_machine_one_ok); ATF_TEST_CASE_HEAD(require_machine_one_ok) {} ATF_TEST_CASE_BODY(require_machine_one_ok) { - atf::tests::vars_map metadata; - metadata["require.machine"] = atf::config::get("atf_machine"); + vars_map metadata; + metadata["require.machine"] = tools::config::get("atf_machine"); do_check("", metadata); } ATF_TEST_CASE(require_machine_one_fail); ATF_TEST_CASE_HEAD(require_machine_one_fail) {} ATF_TEST_CASE_BODY(require_machine_one_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.machine"] = "__fake_machine__"; do_check("Requires the '__fake_machine__' machine type", metadata); } @@ -209,16 +211,16 @@ ATF_TEST_CASE_BODY(require_machine_one_fail) { ATF_TEST_CASE(require_machine_many_ok); ATF_TEST_CASE_HEAD(require_machine_many_ok) {} ATF_TEST_CASE_BODY(require_machine_many_ok) { - atf::tests::vars_map metadata; - metadata["require.machine"] = "__foo__ " + atf::config::get("atf_machine") + - " __bar__"; + vars_map metadata; + metadata["require.machine"] = "__foo__ " + + tools::config::get("atf_machine") + " __bar__"; do_check("", metadata); } ATF_TEST_CASE(require_machine_many_fail); ATF_TEST_CASE_HEAD(require_machine_many_fail) {} ATF_TEST_CASE_BODY(require_machine_many_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.machine"] = "__foo__ __bar__ __baz__"; do_check("Requires one of the '__foo__ __bar__ __baz__' machine types", metadata); @@ -230,14 +232,14 @@ ATF_TEST_CASE_BODY(require_machine_many_fail) { ATF_TEST_CASE_WITHOUT_HEAD(require_memory_ok); ATF_TEST_CASE_BODY(require_memory_ok) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.memory"] = "1m"; do_check("", metadata); } ATF_TEST_CASE_WITHOUT_HEAD(require_memory_not_enough); ATF_TEST_CASE_BODY(require_memory_not_enough) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.memory"] = "128t"; #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) do_check("Not enough memory; needed 140737488355328, available [0-9]*", @@ -249,7 +251,7 @@ ATF_TEST_CASE_BODY(require_memory_not_enough) { ATF_TEST_CASE_WITHOUT_HEAD(require_memory_fail); ATF_TEST_CASE_BODY(require_memory_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.memory"] = "foo"; ATF_REQUIRE_THROW(std::runtime_error, impl::check_requirements(metadata, no_config)); @@ -262,7 +264,7 @@ ATF_TEST_CASE_BODY(require_memory_fail) { ATF_TEST_CASE(require_progs_one_ok); ATF_TEST_CASE_HEAD(require_progs_one_ok) {} ATF_TEST_CASE_BODY(require_progs_one_ok) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.progs"] = "cp"; do_check("", metadata); } @@ -270,7 +272,7 @@ ATF_TEST_CASE_BODY(require_progs_one_ok) { ATF_TEST_CASE(require_progs_one_missing); ATF_TEST_CASE_HEAD(require_progs_one_missing) {} ATF_TEST_CASE_BODY(require_progs_one_missing) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.progs"] = "cp __non-existent__"; do_check("Required program '__non-existent__' not found in the PATH", metadata); @@ -279,7 +281,7 @@ ATF_TEST_CASE_BODY(require_progs_one_missing) { ATF_TEST_CASE(require_progs_one_fail); ATF_TEST_CASE_HEAD(require_progs_one_fail) {} ATF_TEST_CASE_BODY(require_progs_one_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.progs"] = "bin/cp"; ATF_REQUIRE_THROW(std::runtime_error, impl::check_requirements(metadata, no_config)); @@ -288,7 +290,7 @@ ATF_TEST_CASE_BODY(require_progs_one_fail) { ATF_TEST_CASE(require_progs_many_ok); ATF_TEST_CASE_HEAD(require_progs_many_ok) {} ATF_TEST_CASE_BODY(require_progs_many_ok) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.progs"] = "cp ls mv"; do_check("", metadata); } @@ -296,7 +298,7 @@ ATF_TEST_CASE_BODY(require_progs_many_ok) { ATF_TEST_CASE(require_progs_many_missing); ATF_TEST_CASE_HEAD(require_progs_many_missing) {} ATF_TEST_CASE_BODY(require_progs_many_missing) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.progs"] = "mv ls __foo__ cp"; do_check("Required program '__foo__' not found in the PATH", metadata); } @@ -304,7 +306,7 @@ ATF_TEST_CASE_BODY(require_progs_many_missing) { ATF_TEST_CASE(require_progs_many_fail); ATF_TEST_CASE_HEAD(require_progs_many_fail) {} ATF_TEST_CASE_BODY(require_progs_many_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.progs"] = "ls cp ../bin/cp"; ATF_REQUIRE_THROW(std::runtime_error, impl::check_requirements(metadata, no_config)); @@ -317,9 +319,9 @@ ATF_TEST_CASE_BODY(require_progs_many_fail) { ATF_TEST_CASE(require_user_root); ATF_TEST_CASE_HEAD(require_user_root) {} ATF_TEST_CASE_BODY(require_user_root) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.user"] = "root"; - if (atf::atf_run::is_root()) + if (tools::user::is_root()) do_check("", metadata); else do_check("Requires root privileges", metadata); @@ -328,9 +330,9 @@ ATF_TEST_CASE_BODY(require_user_root) { ATF_TEST_CASE(require_user_unprivileged); ATF_TEST_CASE_HEAD(require_user_unprivileged) {} ATF_TEST_CASE_BODY(require_user_unprivileged) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.user"] = "unprivileged"; - if (atf::atf_run::is_root()) + if (tools::user::is_root()) do_check("Requires an unprivileged user and the 'unprivileged-user' " "configuration variable is not set", metadata); else @@ -340,7 +342,7 @@ ATF_TEST_CASE_BODY(require_user_unprivileged) { ATF_TEST_CASE(require_user_fail); ATF_TEST_CASE_HEAD(require_user_fail) {} ATF_TEST_CASE_BODY(require_user_fail) { - atf::tests::vars_map metadata; + vars_map metadata; metadata["require.user"] = "nobody"; ATF_REQUIRE_THROW(std::runtime_error, impl::check_requirements(metadata, no_config)); diff --git a/atf-run/sample/atf-run.hooks b/tools/sample/atf-run.hooks similarity index 100% rename from atf-run/sample/atf-run.hooks rename to tools/sample/atf-run.hooks diff --git a/atf-run/sample/common.conf b/tools/sample/common.conf similarity index 100% rename from atf-run/sample/common.conf rename to tools/sample/common.conf diff --git a/atf-run/several_tcs_helper.c b/tools/several_tcs_helper.c similarity index 100% rename from atf-run/several_tcs_helper.c rename to tools/several_tcs_helper.c diff --git a/atf-run/share/atf-run.hooks b/tools/share/atf-run.hooks similarity index 100% rename from atf-run/share/atf-run.hooks rename to tools/share/atf-run.hooks diff --git a/atf-run/signals.cpp b/tools/signals.cpp similarity index 93% rename from atf-run/signals.cpp rename to tools/signals.cpp index 851c8f02c2c4..0e731de9c827 100644 --- a/atf-run/signals.cpp +++ b/tools/signals.cpp @@ -37,14 +37,13 @@ extern "C" { } #include +#include -#include "atf-c++/detail/exceptions.hpp" -#include "atf-c++/detail/sanity.hpp" - +#include "exceptions.hpp" #include "signals.hpp" -namespace impl = atf::atf_run; -#define IMPL_NAME "atf::atf_run" +namespace impl = tools::signals; +#define IMPL_NAME "tools::signals" const int impl::last_signo = LAST_SIGNO; @@ -110,7 +109,7 @@ impl::signal_programmer::signal_programmer(const int signo, const handler h) : sa.sa_flags = 0; if (::sigaction(m_signo, &sa, &m_oldsa) == -1) - throw atf::system_error(IMPL_NAME, "Could not install handler for " + throw tools::system_error(IMPL_NAME, "Could not install handler for " "signal", errno); m_programmed = true; } @@ -125,7 +124,7 @@ impl::signal_programmer::unprogram(void) { if (m_programmed) { if (::sigaction(m_signo, &m_oldsa, NULL) == -1) - UNREACHABLE; + std::abort(); m_programmed = false; } } diff --git a/atf-run/signals.hpp b/tools/signals.hpp similarity index 93% rename from atf-run/signals.hpp rename to tools/signals.hpp index 8765ac9ec56e..549a2cad0956 100644 --- a/atf-run/signals.hpp +++ b/tools/signals.hpp @@ -27,15 +27,15 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_RUN_SIGNALS_HPP_) -#define _ATF_RUN_SIGNALS_HPP_ +#if !defined(TOOLS_SIGNALS_HPP) +#define TOOLS_SIGNALS_HPP extern "C" { #include } -namespace atf { -namespace atf_run { +namespace tools { +namespace signals { extern const int last_signo; typedef void (*handler)(const int); @@ -86,7 +86,7 @@ class signal_programmer { void reset(const int); -} // namespace atf_run -} // namespace atf +} // namespace signals +} // namespace tools -#endif // !defined(_ATF_RUN_SIGNALS_HPP_) +#endif // !defined(TOOLS_SIGNALS_HPP) diff --git a/atf-run/signals_test.cpp b/tools/signals_test.cpp similarity index 91% rename from atf-run/signals_test.cpp rename to tools/signals_test.cpp index 358c8a8ab590..aa6a8e5a8ea6 100644 --- a/atf-run/signals_test.cpp +++ b/tools/signals_test.cpp @@ -37,13 +37,11 @@ extern "C" { #include #include -#include "atf-c/defs.h" - -#include "atf-c++/macros.hpp" - -#include "atf-c++/detail/exceptions.hpp" -#include "atf-c++/detail/process.hpp" +#include +#include "defs.hpp" +#include "exceptions.hpp" +#include "process.hpp" #include "signals.hpp" // ------------------------------------------------------------------------ @@ -69,7 +67,7 @@ namespace sigusr1 { sigemptyset(&sa.sa_mask); sa.sa_flags = 0; if (::sigaction(SIGUSR1, &sa, NULL) == -1) - throw atf::system_error("sigusr1::program", + throw tools::system_error("sigusr1::program", "sigaction(2) failed", errno); } } // namespace sigusr1 @@ -97,7 +95,7 @@ ATF_TEST_CASE_HEAD(signal_holder_preserve) } ATF_TEST_CASE_BODY(signal_holder_preserve) { - using atf::atf_run::signal_holder; + using tools::signals::signal_holder; sigusr1::program(); @@ -123,7 +121,7 @@ ATF_TEST_CASE_HEAD(signal_holder_destructor) } ATF_TEST_CASE_BODY(signal_holder_destructor) { - using atf::atf_run::signal_holder; + using tools::signals::signal_holder; sigusr1::program(); @@ -149,7 +147,7 @@ ATF_TEST_CASE_HEAD(signal_holder_process) } ATF_TEST_CASE_BODY(signal_holder_process) { - using atf::atf_run::signal_holder; + using tools::signals::signal_holder; sigusr1::program(); @@ -184,7 +182,7 @@ ATF_TEST_CASE_HEAD(signal_programmer_program) } ATF_TEST_CASE_BODY(signal_programmer_program) { - using atf::atf_run::signal_programmer; + using tools::signals::signal_programmer; signal_programmer sp(SIGUSR1, sigusr1_2::handler); @@ -201,7 +199,7 @@ ATF_TEST_CASE_HEAD(signal_programmer_preserve) } ATF_TEST_CASE_BODY(signal_programmer_preserve) { - using atf::atf_run::signal_programmer; + using tools::signals::signal_programmer; sigusr1::program(); sigusr1::happened = false; @@ -230,7 +228,7 @@ reset_child(void *v ATF_DEFS_ATTRIBUTE_UNUSED) sigusr1::program(); sigusr1::happened = false; - atf::atf_run::reset(SIGUSR1); + tools::signals::reset(SIGUSR1); kill(::getpid(), SIGUSR1); if (sigusr1::happened) { @@ -248,11 +246,11 @@ ATF_TEST_CASE_HEAD(reset) } ATF_TEST_CASE_BODY(reset) { - atf::process::child c = - atf::process::fork(reset_child, atf::process::stream_inherit(), - atf::process::stream_inherit(), NULL); + tools::process::child c = + tools::process::fork(reset_child, tools::process::stream_inherit(), + tools::process::stream_inherit(), NULL); - const atf::process::status s = c.wait(); + const tools::process::status s = c.wait(); ATF_REQUIRE(s.exited() || s.signaled()); ATF_REQUIRE(!s.signaled() || s.termsig() == SIGUSR1); } diff --git a/atf-run/test-program.cpp b/tools/test-program.cpp similarity index 78% rename from atf-run/test-program.cpp rename to tools/test-program.cpp index 14647c2f78fd..91ad78acb497 100644 --- a/atf-run/test-program.cpp +++ b/tools/test-program.cpp @@ -37,34 +37,34 @@ extern "C" { #include } +#include #include #include #include #include #include -#include "atf-c/defs.h" - -#include "atf-c++/detail/env.hpp" -#include "atf-c++/detail/parser.hpp" -#include "atf-c++/detail/process.hpp" -#include "atf-c++/detail/sanity.hpp" -#include "atf-c++/detail/text.hpp" - -#include "config.hpp" +#include "config_file.hpp" +#include "defs.hpp" +#include "env.hpp" #include "fs.hpp" #include "io.hpp" +#include "parser.hpp" +#include "process.hpp" #include "requirements.hpp" #include "signals.hpp" #include "test-program.hpp" -#include "timer.hpp" +#include "text.hpp" +#include "timers.hpp" #include "user.hpp" -namespace impl = atf::atf_run; -namespace detail = atf::atf_run::detail; +namespace impl = tools::test_program; +namespace detail = tools::test_program::detail; namespace { +typedef std::map< std::string, std::string > vars_map; + static void check_stream(std::ostream& os) { @@ -81,16 +81,16 @@ check_stream(std::ostream& os) namespace atf_tp { -static const atf::parser::token_type eof_type = 0; -static const atf::parser::token_type nl_type = 1; -static const atf::parser::token_type text_type = 2; -static const atf::parser::token_type colon_type = 3; -static const atf::parser::token_type dblquote_type = 4; +static const tools::parser::token_type eof_type = 0; +static const tools::parser::token_type nl_type = 1; +static const tools::parser::token_type text_type = 2; +static const tools::parser::token_type colon_type = 3; +static const tools::parser::token_type dblquote_type = 4; -class tokenizer : public atf::parser::tokenizer< std::istream > { +class tokenizer : public tools::parser::tokenizer< std::istream > { public: tokenizer(std::istream& is, size_t curline) : - atf::parser::tokenizer< std::istream > + tools::parser::tokenizer< std::istream > (is, true, eof_type, nl_type, text_type, curline) { add_delim(':', colon_type); @@ -103,7 +103,7 @@ class tokenizer : public atf::parser::tokenizer< std::istream > { class metadata_reader : public detail::atf_tp_reader { impl::test_cases_map m_tcs; - void got_tc(const std::string& ident, const atf::tests::vars_map& props) + void got_tc(const std::string& ident, const vars_map& props) { if (m_tcs.find(ident) != m_tcs.end()) throw(std::runtime_error("Duplicate test case " + ident + @@ -132,11 +132,11 @@ class metadata_reader : public detail::atf_tp_reader { }; struct get_metadata_params { - const atf::fs::path& executable; - const atf::tests::vars_map& config; + const tools::fs::path& executable; + const vars_map& config; - get_metadata_params(const atf::fs::path& p_executable, - const atf::tests::vars_map& p_config) : + get_metadata_params(const tools::fs::path& p_executable, + const vars_map& p_config) : executable(p_executable), config(p_config) { @@ -144,21 +144,21 @@ struct get_metadata_params { }; struct test_case_params { - const atf::fs::path& executable; + const tools::fs::path& executable; const std::string& test_case_name; const std::string& test_case_part; - const atf::tests::vars_map& metadata; - const atf::tests::vars_map& config; - const atf::fs::path& resfile; - const atf::fs::path& workdir; + const vars_map& metadata; + const vars_map& config; + const tools::fs::path& resfile; + const tools::fs::path& workdir; - test_case_params(const atf::fs::path& p_executable, + test_case_params(const tools::fs::path& p_executable, const std::string& p_test_case_name, const std::string& p_test_case_part, - const atf::tests::vars_map& p_metadata, - const atf::tests::vars_map& p_config, - const atf::fs::path& p_resfile, - const atf::fs::path& p_workdir) : + const vars_map& p_metadata, + const vars_map& p_config, + const tools::fs::path& p_resfile, + const tools::fs::path& p_workdir) : executable(p_executable), test_case_name(p_test_case_name), test_case_part(p_test_case_part), @@ -211,7 +211,7 @@ vector_to_argv(const std::vector< std::string >& v) static void -exec_or_exit(const atf::fs::path& executable, +exec_or_exit(const tools::fs::path& executable, const std::vector< std::string >& argv) { // This leaks memory in case of a failure, but it is OK. Exiting will @@ -229,11 +229,11 @@ exec_or_exit(const atf::fs::path& executable, static std::vector< std::string > -config_to_args(const atf::tests::vars_map& config) +config_to_args(const vars_map& config) { std::vector< std::string > args; - for (atf::tests::vars_map::const_iterator iter = config.begin(); + for (vars_map::const_iterator iter = config.begin(); iter != config.end(); iter++) args.push_back("-v" + (*iter).first + "=" + (*iter).second); @@ -248,35 +248,35 @@ silence_stdin(void) int fd = ::open("/dev/null", O_RDONLY); if (fd == -1) throw std::runtime_error("Could not open /dev/null"); - INV(fd == STDIN_FILENO); + assert(fd == STDIN_FILENO); } static void -prepare_child(const atf::fs::path& workdir) +prepare_child(const tools::fs::path& workdir) { const int ret = ::setpgid(::getpid(), 0); - INV(ret != -1); + assert(ret != -1); ::umask(S_IWGRP | S_IWOTH); - for (int i = 1; i <= impl::last_signo; i++) - impl::reset(i); + for (int i = 1; i <= tools::signals::last_signo; i++) + tools::signals::reset(i); - atf::env::set("HOME", workdir.str()); - atf::env::unset("LANG"); - atf::env::unset("LC_ALL"); - atf::env::unset("LC_COLLATE"); - atf::env::unset("LC_CTYPE"); - atf::env::unset("LC_MESSAGES"); - atf::env::unset("LC_MONETARY"); - atf::env::unset("LC_NUMERIC"); - atf::env::unset("LC_TIME"); - atf::env::set("TZ", "UTC"); + tools::env::set("HOME", workdir.str()); + tools::env::unset("LANG"); + tools::env::unset("LC_ALL"); + tools::env::unset("LC_COLLATE"); + tools::env::unset("LC_CTYPE"); + tools::env::unset("LC_MESSAGES"); + tools::env::unset("LC_MONETARY"); + tools::env::unset("LC_NUMERIC"); + tools::env::unset("LC_TIME"); + tools::env::set("TZ", "UTC"); - atf::env::set("__RUNNING_INSIDE_ATF_RUN", "internal-yes-value"); + tools::env::set("__RUNNING_INSIDE_ATF_RUN", "internal-yes-value"); - impl::change_directory(workdir); + tools::fs::change_directory(workdir); silence_stdin(); } @@ -303,14 +303,14 @@ run_test_case_child(void* raw_params) const test_case_params* params = static_cast< const test_case_params* >(raw_params); - const std::pair< int, int > user = impl::get_required_user( + const std::pair< int, int > user = tools::get_required_user( params->metadata, params->config); if (user.first != -1 && user.second != -1) - impl::drop_privileges(user); + tools::user::drop_privileges(user); // The input 'tp' parameter may be relative and become invalid once // we change the current working directory. - const atf::fs::path absolute_executable = params->executable.to_absolute(); + const tools::fs::path absolute_executable = params->executable.to_absolute(); // Prepare the test program's arguments. We use dynamic memory and // do not care to release it. We are going to die anyway very soon, @@ -338,7 +338,7 @@ tokenize_result(const std::string& line, std::string& out_state, } else if (line[pos] == ':') { out_state = line.substr(0, pos); out_arg = ""; - out_reason = atf::text::trim(line.substr(pos + 1)); + out_reason = tools::text::trim(line.substr(pos + 1)); } else if (line[pos] == '(') { const std::string::size_type pos2 = line.find("):", pos); if (pos2 == std::string::npos) @@ -346,16 +346,16 @@ tokenize_result(const std::string& line, std::string& out_state, "': unclosed optional argument"); out_state = line.substr(0, pos); out_arg = line.substr(pos + 1, pos2 - pos - 1); - out_reason = atf::text::trim(line.substr(pos2 + 2)); + out_reason = tools::text::trim(line.substr(pos2 + 2)); } else - UNREACHABLE; + std::abort(); } static impl::test_case_result handle_result(const std::string& state, const std::string& arg, const std::string& reason) { - PRE(state == "passed"); + assert(state == "passed"); if (!arg.empty() || !reason.empty()) throw std::runtime_error("The test case result '" + state + "' cannot " @@ -368,7 +368,7 @@ static impl::test_case_result handle_result_with_reason(const std::string& state, const std::string& arg, const std::string& reason) { - PRE(state == "expected_death" || state == "expected_failure" || + assert(state == "expected_death" || state == "expected_failure" || state == "expected_timeout" || state == "failed" || state == "skipped"); if (!arg.empty() || reason.empty()) @@ -383,7 +383,7 @@ handle_result_with_reason_and_arg(const std::string& state, const std::string& arg, const std::string& reason) { - PRE(state == "expected_exit" || state == "expected_signal"); + assert(state == "expected_exit" || state == "expected_signal"); if (reason.empty()) throw std::runtime_error("The test case result '" + state + "' must " @@ -394,7 +394,7 @@ handle_result_with_reason_and_arg(const std::string& state, value = -1; } else { try { - value = atf::text::to_type< int >(arg); + value = tools::text::to_type< int >(arg); } catch (const std::runtime_error&) { throw std::runtime_error("The value '" + arg + "' passed to the '" + state + "' state must be an integer"); @@ -432,7 +432,7 @@ detail::atf_tp_reader::validate_and_insert(const std::string& name, const std::string& value, const size_t lineno, std::map< std::string, std::string >& md) { - using atf::parser::parse_error; + using tools::parser::parse_error; if (value.empty()) throw parse_error(lineno, "The value for '" + name +"' cannot be " @@ -445,13 +445,13 @@ detail::atf_tp_reader::validate_and_insert(const std::string& name, // Any non-empty value is valid. } else if (name == "has.cleanup") { try { - (void)atf::text::to_bool(value); + (void)tools::text::to_bool(value); } catch (const std::runtime_error&) { throw parse_error(lineno, "The has.cleanup property requires a" " boolean value"); } } else if (name == "ident") { - if (!atf::text::match(value, ident_regex)) + if (!tools::text::match(value, ident_regex)) throw parse_error(lineno, "The identifier must match " + ident_regex + "; was '" + value + "'"); } else if (name == "require.arch") { @@ -460,7 +460,7 @@ detail::atf_tp_reader::validate_and_insert(const std::string& name, } else if (name == "require.machine") { } else if (name == "require.memory") { try { - (void)atf::text::to_bytes(value); + (void)tools::text::to_bytes(value); } catch (const std::runtime_error&) { throw parse_error(lineno, "The require.memory property requires an " "integer value representing an amount of bytes"); @@ -468,7 +468,7 @@ detail::atf_tp_reader::validate_and_insert(const std::string& name, } else if (name == "require.progs") { } else if (name == "require.user") { } else if (name == "timeout") { - if (!atf::text::match(value, integer_regex)) + if (!tools::text::match(value, integer_regex)) throw parse_error(lineno, "The timeout property requires an integer" " value"); } else if (name == "use.fs") { @@ -485,19 +485,19 @@ detail::atf_tp_reader::validate_and_insert(const std::string& name, void detail::atf_tp_reader::read(void) { - using atf::parser::parse_error; + using tools::parser::parse_error; using namespace atf_tp; - std::pair< size_t, atf::parser::headers_map > hml = - atf::parser::read_headers(m_is, 1); - atf::parser::validate_content_type(hml.second, + std::pair< size_t, tools::parser::headers_map > hml = + tools::parser::read_headers(m_is, 1); + tools::parser::validate_content_type(hml.second, "application/X-atf-tp", 1); tokenizer tkz(m_is, hml.first); - atf::parser::parser< tokenizer > p(tkz); + tools::parser::parser< tokenizer > p(tkz); try { - atf::parser::token t = p.expect(text_type, "property name"); + tools::parser::token t = p.expect(text_type, "property name"); if (t.text() != "ident") throw parse_error(t.lineno(), "First property of a test case " "must be 'ident'"); @@ -506,7 +506,7 @@ detail::atf_tp_reader::read(void) do { const std::string name = t.text(); t = p.expect(colon_type, "`:'"); - const std::string value = atf::text::trim(p.rest_of_line()); + const std::string value = tools::text::trim(p.rest_of_line()); t = p.expect(nl_type, "new line"); validate_and_insert(name, value, t.lineno(), props); @@ -565,13 +565,13 @@ detail::parse_test_case_result(const std::string& line) impl::atf_tps_writer::atf_tps_writer(std::ostream& os) : m_os(os) { - atf::parser::headers_map hm; - atf::parser::attrs_map ct_attrs; + tools::parser::headers_map hm; + tools::parser::attrs_map ct_attrs; ct_attrs["version"] = "3"; hm["Content-Type"] = - atf::parser::header_entry("Content-Type", "application/X-atf-tps", + tools::parser::header_entry("Content-Type", "application/X-atf-tps", ct_attrs); - atf::parser::write_headers(hm, m_os); + tools::parser::write_headers(hm, m_os); } void @@ -600,7 +600,7 @@ impl::atf_tps_writer::start_tp(const std::string& tp, size_t ntcs) void impl::atf_tps_writer::end_tp(const std::string& reason) { - PRE(reason.find('\n') == std::string::npos); + assert(reason.find('\n') == std::string::npos); if (reason.empty()) m_os << "tp-end: " << generate_timestamp() << ", " << m_tpname << "\n"; else @@ -647,31 +647,31 @@ impl::atf_tps_writer::end_tc(const std::string& state, } impl::metadata -impl::get_metadata(const atf::fs::path& executable, - const atf::tests::vars_map& config) +impl::get_metadata(const tools::fs::path& executable, + const vars_map& config) { get_metadata_params params(executable, config); - atf::process::child child = - atf::process::fork(get_metadata_child, - atf::process::stream_capture(), - atf::process::stream_inherit(), + tools::process::child child = + tools::process::fork(get_metadata_child, + tools::process::stream_capture(), + tools::process::stream_inherit(), static_cast< void * >(¶ms)); - impl::pistream outin(child.stdout_fd()); + tools::io::pistream outin(child.stdout_fd()); metadata_reader parser(outin); parser.read(); - const atf::process::status status = child.wait(); + const tools::process::status status = child.wait(); if (!status.exited() || status.exitstatus() != EXIT_SUCCESS) - throw atf::parser::format_error("Test program returned failure " + throw tools::parser::format_error("Test program returned failure " "exit status for test case list"); return metadata(parser.get_tcs()); } impl::test_case_result -impl::read_test_case_result(const atf::fs::path& results_path) +impl::read_test_case_result(const tools::fs::path& results_path) { std::ifstream results_file(results_path.c_str()); if (!results_file) @@ -700,7 +700,7 @@ sigchld_handler(const int signo ATF_DEFS_ATTRIBUTE_UNUSED) terminate_poll = true; } -class child_muxer : public impl::muxer { +class child_muxer : public tools::io::muxer { impl::atf_tps_writer& m_writer; void @@ -709,7 +709,7 @@ class child_muxer : public impl::muxer { switch (index) { case 0: m_writer.stdout_tc(line); break; case 1: m_writer.stderr_tc(line); break; - default: UNREACHABLE; + default: std::abort(); } } @@ -724,14 +724,14 @@ class child_muxer : public impl::muxer { } // anonymous namespace -std::pair< std::string, atf::process::status > -impl::run_test_case(const atf::fs::path& executable, +std::pair< std::string, tools::process::status > +impl::run_test_case(const tools::fs::path& executable, const std::string& test_case_name, const std::string& test_case_part, - const atf::tests::vars_map& metadata, - const atf::tests::vars_map& config, - const atf::fs::path& resfile, - const atf::fs::path& workdir, + const vars_map& metadata, + const vars_map& config, + const tools::fs::path& resfile, + const tools::fs::path& workdir, atf_tps_writer& writer) { // TODO: Capture termination signals and deliver them to the subprocess @@ -739,23 +739,23 @@ impl::run_test_case(const atf::fs::path& executable, test_case_params params(executable, test_case_name, test_case_part, metadata, config, resfile, workdir); - atf::process::child child = - atf::process::fork(run_test_case_child, - atf::process::stream_capture(), - atf::process::stream_capture(), + tools::process::child child = + tools::process::fork(run_test_case_child, + tools::process::stream_capture(), + tools::process::stream_capture(), static_cast< void * >(¶ms)); terminate_poll = false; - const atf::tests::vars_map::const_iterator iter = metadata.find("timeout"); - INV(iter != metadata.end()); + const vars_map::const_iterator iter = metadata.find("timeout"); + assert(iter != metadata.end()); const unsigned int timeout = - atf::text::to_type< unsigned int >((*iter).second); + tools::text::to_type< unsigned int >((*iter).second); const pid_t child_pid = child.pid(); // Get the input stream of stdout and stderr. - impl::file_handle outfh = child.stdout_fd(); - impl::file_handle errfh = child.stderr_fd(); + tools::io::file_handle outfh = child.stdout_fd(); + tools::io::file_handle errfh = child.stderr_fd(); bool timed_out = false; @@ -764,17 +764,17 @@ impl::run_test_case(const atf::fs::path& executable, int fds[2] = {outfh.get(), errfh.get()}; child_muxer mux(fds, 2, writer); try { - child_timer timeout_timer(timeout, child_pid, terminate_poll); - signal_programmer sigchld(SIGCHLD, sigchld_handler); + timers::child_timer timeout_timer(timeout, child_pid, terminate_poll); + signals::signal_programmer sigchld(SIGCHLD, sigchld_handler); mux.mux(terminate_poll); timed_out = timeout_timer.fired(); } catch (...) { - UNREACHABLE; + std::abort(); } ::killpg(child_pid, SIGKILL); mux.flush(); - atf::process::status status = child.wait(); + tools::process::status status = child.wait(); std::string reason; @@ -782,7 +782,7 @@ impl::run_test_case(const atf::fs::path& executable, // Don't assume the child process has been signaled due to the timeout // expiration as older versions did. The child process may have exited // but we may have timed out due to a subchild process getting stuck. - reason = "Test case timed out after " + atf::text::to_string(timeout) + + reason = "Test case timed out after " + tools::text::to_string(timeout) + " " + (timeout == 1 ? "second" : "seconds"); } diff --git a/atf-run/test-program.hpp b/tools/test-program.hpp similarity index 80% rename from atf-run/test-program.hpp rename to tools/test-program.hpp index daba3ce01f0d..f2f197289657 100644 --- a/atf-run/test-program.hpp +++ b/tools/test-program.hpp @@ -27,15 +27,17 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // +#if !defined(TOOLS_TEST_PROGRAM_HPP) +#define TOOLS_TEST_PROGRAM_HPP + #include +#include -#include "atf-c++/tests.hpp" +#include "fs.hpp" +#include "process.hpp" -#include "atf-c++/detail/fs.hpp" -#include "atf-c++/detail/process.hpp" - -namespace atf { -namespace atf_run { +namespace tools { +namespace test_program { struct test_case_result { std::string m_state; @@ -122,7 +124,8 @@ class atf_tps_writer { void end_tc(const std::string&, const std::string&); }; -typedef std::map< std::string, atf::tests::vars_map > test_cases_map; +typedef std::map< std::string, std::map< std::string, std::string > > + test_cases_map; struct metadata { test_cases_map test_cases; @@ -139,12 +142,16 @@ struct metadata { class atf_tps_writer; -metadata get_metadata(const atf::fs::path&, const atf::tests::vars_map&); -test_case_result read_test_case_result(const atf::fs::path&); -std::pair< std::string, atf::process::status > run_test_case( - const atf::fs::path&, const std::string&, const std::string&, - const atf::tests::vars_map&, const atf::tests::vars_map&, - const atf::fs::path&, const atf::fs::path&, atf_tps_writer&); +metadata get_metadata(const tools::fs::path&, + const std::map< std::string, std::string >&); +test_case_result read_test_case_result(const tools::fs::path&); +std::pair< std::string, tools::process::status > run_test_case( + const tools::fs::path&, const std::string&, const std::string&, + const std::map< std::string, std::string >&, + const std::map< std::string, std::string >&, + const tools::fs::path&, const tools::fs::path&, atf_tps_writer&); -} // namespace atf_run -} // namespace atf +} // namespace test_program +} // namespace tools + +#endif // !defined(TOOLS_TEST_PROGRAM_HPP) diff --git a/tools/test_helpers.hpp b/tools/test_helpers.hpp new file mode 100644 index 000000000000..3ac92d0ea79e --- /dev/null +++ b/tools/test_helpers.hpp @@ -0,0 +1,116 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2009 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if defined(TOOLS_TEST_HELPERS_H) +# error "Cannot include test_helpers.hpp more than once." +#else +# define TOOLS_TEST_HELPERS_H +#endif + +#include +#include +#include + +#include + +#include "parser.hpp" +#include "text.hpp" + +namespace test_helpers_detail { + +typedef std::vector< std::string > string_vector; + +template< class Reader > +std::pair< string_vector, string_vector > +do_read(const char* input) +{ + string_vector errors; + + std::istringstream is(input); + Reader reader(is); + try { + reader.read(); + } catch (const tools::parser::parse_errors& pes) { + for (std::vector< tools::parser::parse_error >::const_iterator iter = + pes.begin(); iter != pes.end(); iter++) + errors.push_back(*iter); + } catch (const tools::parser::parse_error& pe) { + ATF_FAIL("Raised a lonely parse error: " + + tools::text::to_string(pe.first) + ": " + pe.second); + } + + return std::make_pair(reader.m_calls, errors); +} + +void +check_equal(const char* expected[], const string_vector& actual) +{ + const char** expected_iter = expected; + string_vector::const_iterator actual_iter = actual.begin(); + + bool equals = true; + while (equals && *expected_iter != NULL && actual_iter != actual.end()) { + if (*expected_iter != *actual_iter) { + equals = false; + } else { + expected_iter++; + actual_iter++; + } + } + if (equals && ((*expected_iter == NULL && actual_iter != actual.end()) || + (*expected_iter != NULL && actual_iter == actual.end()))) + equals = false; + + if (!equals) { + std::cerr << "EXPECTED:\n"; + for (expected_iter = expected; *expected_iter != NULL; expected_iter++) + std::cerr << *expected_iter << "\n"; + + std::cerr << "ACTUAL:\n"; + for (actual_iter = actual.begin(); actual_iter != actual.end(); + actual_iter++) + std::cerr << *actual_iter << "\n"; + + ATF_FAIL("Expected results differ to actual values"); + } +} + +} // namespace test_helpers_detail + +template< class Reader > +void +do_parser_test(const char* input, const char* exp_calls[], + const char* exp_errors[]) +{ + const std::pair< test_helpers_detail::string_vector, + test_helpers_detail::string_vector > + actual = test_helpers_detail::do_read< Reader >(input); + test_helpers_detail::check_equal(exp_calls, actual.first); + test_helpers_detail::check_equal(exp_errors, actual.second); +} diff --git a/atf-run/test_program_test.cpp b/tools/test_program_test.cpp similarity index 95% rename from atf-run/test_program_test.cpp rename to tools/test_program_test.cpp index 444dc3e4d8f4..693790d8d462 100644 --- a/atf-run/test_program_test.cpp +++ b/tools/test_program_test.cpp @@ -30,28 +30,29 @@ #include #include -#include "atf-c++/macros.hpp" - -#include "atf-c++/detail/parser.hpp" -#include "atf-c++/detail/test_helpers.hpp" -#include "atf-c++/detail/text.hpp" +#include +#include "parser.hpp" #include "test-program.hpp" +#include "test_helpers.hpp" +#include "text.hpp" -namespace impl = atf::atf_run; -namespace detail = atf::atf_run::detail; - -using atf::tests::vars_map; +namespace impl = tools::test_program; +namespace detail = tools::test_program::detail; // ------------------------------------------------------------------------- // Auxiliary functions. // ------------------------------------------------------------------------- +namespace { + +typedef std::map< std::string, std::string > vars_map; + static -atf::fs::path +tools::fs::path get_helper(const atf::tests::tc& tc, const char* name) { - return atf::fs::path(tc.get_config_var("srcdir")) / name; + return tools::fs::path(tc.get_config_var("srcdir")) / name; } static @@ -86,7 +87,7 @@ static void print_indented(const std::string& str) { - std::vector< std::string > ws = atf::text::split(str, "\n"); + std::vector< std::string > ws = tools::text::split(str, "\n"); for (std::vector< std::string >::const_iterator iter = ws.begin(); iter != ws.end(); iter++) std::cout << ">>" << *iter << "<<\n"; @@ -101,7 +102,7 @@ void check_match(const atf::tests::tc& tc, const std::string& str, const std::string& exp) { - if (!atf::text::match(str, exp)) { + if (!tools::text::match(str, exp)) { std::cout << "String match check failed.\n" << "Adding >> and << to delimit the string boundaries " "below.\n"; @@ -113,6 +114,8 @@ check_match(const atf::tests::tc& tc, const std::string& str, } } +} // anonymous namespace + // ------------------------------------------------------------------------- // Tests for the "tp" reader. // ------------------------------------------------------------------------- @@ -758,23 +761,23 @@ ATF_TEST_CASE_BODY(atf_tps_writer) ATF_TEST_CASE(get_metadata_bad); ATF_TEST_CASE_HEAD(get_metadata_bad) {} ATF_TEST_CASE_BODY(get_metadata_bad) { - const atf::fs::path executable = get_helper(*this, "bad_metadata_helper"); - ATF_REQUIRE_THROW(atf::parser::parse_errors, - impl::get_metadata(executable, vars_map())); + const tools::fs::path executable = get_helper(*this, "bad_metadata_helper"); + ATF_REQUIRE_THROW(tools::parser::parse_errors, + impl::get_metadata(executable, vars_map())); } ATF_TEST_CASE(get_metadata_zero_tcs); ATF_TEST_CASE_HEAD(get_metadata_zero_tcs) {} ATF_TEST_CASE_BODY(get_metadata_zero_tcs) { - const atf::fs::path executable = get_helper(*this, "zero_tcs_helper"); - ATF_REQUIRE_THROW(atf::parser::parse_errors, - impl::get_metadata(executable, vars_map())); + const tools::fs::path executable = get_helper(*this, "zero_tcs_helper"); + ATF_REQUIRE_THROW(tools::parser::parse_errors, + impl::get_metadata(executable, vars_map())); } ATF_TEST_CASE(get_metadata_several_tcs); ATF_TEST_CASE_HEAD(get_metadata_several_tcs) {} ATF_TEST_CASE_BODY(get_metadata_several_tcs) { - const atf::fs::path executable = get_helper(*this, "several_tcs_helper"); + const tools::fs::path executable = get_helper(*this, "several_tcs_helper"); const impl::metadata md = impl::get_metadata(executable, vars_map()); ATF_REQUIRE_EQ(3, md.test_cases.size()); @@ -925,7 +928,7 @@ ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_failed); ATF_TEST_CASE_BODY(read_test_case_result_failed) { write_test_case_result("resfile", "failed: foo bar\n"); const impl::test_case_result tcr = impl::read_test_case_result( - atf::fs::path("resfile")); + tools::fs::path("resfile")); ATF_REQUIRE_EQ("failed", tcr.state()); ATF_REQUIRE_EQ("foo bar", tcr.reason()); } @@ -934,7 +937,7 @@ ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_skipped); ATF_TEST_CASE_BODY(read_test_case_result_skipped) { write_test_case_result("resfile", "skipped: baz bar\n"); const impl::test_case_result tcr = impl::read_test_case_result( - atf::fs::path("resfile")); + tools::fs::path("resfile")); ATF_REQUIRE_EQ("skipped", tcr.state()); ATF_REQUIRE_EQ("baz bar", tcr.reason()); } @@ -944,28 +947,28 @@ ATF_TEST_CASE(read_test_case_result_no_file); ATF_TEST_CASE_HEAD(read_test_case_result_no_file) {} ATF_TEST_CASE_BODY(read_test_case_result_no_file) { ATF_REQUIRE_THROW(std::runtime_error, - impl::read_test_case_result(atf::fs::path("resfile"))); + impl::read_test_case_result(tools::fs::path("resfile"))); } ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_empty_file); ATF_TEST_CASE_BODY(read_test_case_result_empty_file) { write_test_case_result("resfile", ""); ATF_REQUIRE_THROW(std::runtime_error, - impl::read_test_case_result(atf::fs::path("resfile"))); + impl::read_test_case_result(tools::fs::path("resfile"))); } ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_invalid); ATF_TEST_CASE_BODY(read_test_case_result_invalid) { write_test_case_result("resfile", "passed: hello\n"); ATF_REQUIRE_THROW(std::runtime_error, - impl::read_test_case_result(atf::fs::path("resfile"))); + impl::read_test_case_result(tools::fs::path("resfile"))); } ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_multiline); ATF_TEST_CASE_BODY(read_test_case_result_multiline) { write_test_case_result("resfile", "skipped: foo\nbar\n"); const impl::test_case_result tcr = impl::read_test_case_result( - atf::fs::path("resfile")); + tools::fs::path("resfile")); ATF_REQUIRE_EQ("skipped", tcr.state()); ATF_REQUIRE_EQ("foo<>bar", tcr.reason()); } diff --git a/atf-report/tests-results.css b/tools/tests-results.css similarity index 100% rename from atf-report/tests-results.css rename to tools/tests-results.css diff --git a/atf-report/tests-results.dtd b/tools/tests-results.dtd similarity index 100% rename from atf-report/tests-results.dtd rename to tools/tests-results.dtd diff --git a/atf-report/tests-results.xsl b/tools/tests-results.xsl similarity index 100% rename from atf-report/tests-results.xsl rename to tools/tests-results.xsl diff --git a/tools/text.cpp b/tools/text.cpp new file mode 100644 index 000000000000..9084f7e808e0 --- /dev/null +++ b/tools/text.cpp @@ -0,0 +1,158 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +extern "C" { +#include +} + +#include +#include +#include + +#include "exceptions.hpp" +#include "text.hpp" + +namespace impl = tools::text; +#define IMPL_NAME "tools::text" + +char* +impl::duplicate(const char* str) +{ + char* copy = new char[std::strlen(str) + 1]; + std::strcpy(copy, str); + return copy; +} + +bool +impl::match(const std::string& str, const std::string& regex) +{ + bool found; + + // Special case: regcomp does not like empty regular expressions. + if (regex.empty()) { + found = str.empty(); + } else { + ::regex_t preg; + + if (::regcomp(&preg, regex.c_str(), REG_EXTENDED) != 0) + throw std::runtime_error("Invalid regular expression '" + regex + + "'"); + + const int res = ::regexec(&preg, str.c_str(), 0, NULL, 0); + regfree(&preg); + if (res != 0 && res != REG_NOMATCH) + throw std::runtime_error("Invalid regular expression " + regex); + + found = res == 0; + } + + return found; +} + +std::string +impl::to_lower(const std::string& str) +{ + std::string lc; + for (std::string::const_iterator iter = str.begin(); iter != str.end(); + iter++) + lc += std::tolower(*iter); + return lc; +} + +std::vector< std::string > +impl::split(const std::string& str, const std::string& delim) +{ + std::vector< std::string > words; + + std::string::size_type pos = 0, newpos = 0; + while (pos < str.length() && newpos != std::string::npos) { + newpos = str.find(delim, pos); + if (newpos != pos) + words.push_back(str.substr(pos, newpos - pos)); + pos = newpos + delim.length(); + } + + return words; +} + +std::string +impl::trim(const std::string& str) +{ + std::string::size_type pos1 = str.find_first_not_of(" \t"); + std::string::size_type pos2 = str.find_last_not_of(" \t"); + + if (pos1 == std::string::npos && pos2 == std::string::npos) + return ""; + else if (pos1 == std::string::npos) + return str.substr(0, str.length() - pos2); + else if (pos2 == std::string::npos) + return str.substr(pos1); + else + return str.substr(pos1, pos2 - pos1 + 1); +} + +bool +impl::to_bool(const std::string& str) +{ + const std::string lower = to_lower(str); + if (lower == "yes" || lower == "true") + return true; + else if (lower == "no" || lower == "false") + return false; + else { + // XXX Not really a libc error. + throw system_error(IMPL_NAME "::to_bool", "Cannot convert string " + "'" + str + "' to boolean", EINVAL); + } +} + +int64_t +impl::to_bytes(std::string str) +{ + if (str.empty()) + throw std::runtime_error("Empty value"); + + const char unit = str[str.length() - 1]; + int64_t multiplier; + switch (unit) { + case 'k': case 'K': multiplier = 1 << 10; break; + case 'm': case 'M': multiplier = 1 << 20; break; + case 'g': case 'G': multiplier = 1 << 30; break; + case 't': case 'T': multiplier = int64_t(1) << 40; break; + default: + if (!std::isdigit(unit)) + throw std::runtime_error(std::string("Unknown size unit '") + unit + + "'"); + multiplier = 1; + } + if (multiplier != 1) + str.erase(str.length() - 1); + + return to_type< int64_t >(str) * multiplier; +} diff --git a/tools/text.hpp b/tools/text.hpp new file mode 100644 index 000000000000..0b3dbaad0f96 --- /dev/null +++ b/tools/text.hpp @@ -0,0 +1,153 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#if !defined(TOOLS_TEXT_HPP) +#define TOOLS_TEXT_HPP + +extern "C" { +#include +} + +#include +#include +#include +#include + +namespace tools { +namespace text { + +//! +//! \brief Duplicates a C string using the new[] allocator. +//! +//! Replaces the functionality of strdup by using the new[] allocator and +//! thus allowing the resulting memory to be managed by utils::auto_array. +//! +char* duplicate(const char*); + +//! +//! \brief Joins multiple words into a string. +//! +//! Joins a list of words into a string, separating them using the provided +//! separator. Empty words are not omitted. +//! +template< class T > +std::string +join(const T& words, const std::string& separator) +{ + std::string str; + + typename T::const_iterator iter = words.begin(); + bool done = iter == words.end(); + while (!done) { + str += *iter; + iter++; + if (iter != words.end()) + str += separator; + else + done = true; + } + + return str; +} + +//! +//! \brief Checks if the string matches a regular expression. +//! +bool match(const std::string&, const std::string&); + +//! +//! \brief Splits a string into words. +//! +//! Splits the given string into multiple words, all separated by the +//! given delimiter. Multiple occurrences of the same delimiter are +//! not condensed so that rejoining the words later on using the same +//! delimiter results in the original string. +//! +std::vector< std::string > split(const std::string&, const std::string&); + +//! +//! \brief Removes whitespace from the beginning and end of a string. +//! +std::string trim(const std::string&); + +//! +//! \brief Converts a string to a boolean value. +//! +bool to_bool(const std::string&); + +//! +//! \brief Converts the given string to a bytes size. +//! +int64_t to_bytes(std::string); + +//! +//! \brief Changes the case of a string to lowercase. +//! +//! Returns a new string that is a lowercased version of the original +//! one. +//! +std::string to_lower(const std::string&); + +//! +//! \brief Converts the given object to a string. +//! +//! Returns a string with the representation of the given object. There +//! must exist an operator<< method for that object. +//! +template< class T > +std::string +to_string(const T& ob) +{ + std::ostringstream ss; + ss << ob; + return ss.str(); +} + +//! +//! \brief Converts the given string to another type. +//! +//! Attempts to convert the given string to the requested type. Throws +//! an exception if the conversion failed. +//! +template< class T > +T +to_type(const std::string& str) +{ + std::istringstream ss(str); + T value; + ss >> value; + if (!ss.eof() || (ss.eof() && (ss.fail() || ss.bad()))) + throw std::runtime_error("Cannot convert string to requested type"); + return value; +} + +} // namespace text +} // namespace tools + +#endif // !defined(TOOLS_TEXT_HPP) diff --git a/tools/text_test.cpp b/tools/text_test.cpp new file mode 100644 index 000000000000..0fa31d827328 --- /dev/null +++ b/tools/text_test.cpp @@ -0,0 +1,390 @@ +// +// Automated Testing Framework (atf) +// +// Copyright (c) 2007 The NetBSD Foundation, Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND +// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#include +#include +#include + +#include + +#include "text.hpp" + +// ------------------------------------------------------------------------ +// Test cases for the free functions. +// ------------------------------------------------------------------------ + +ATF_TEST_CASE(duplicate); +ATF_TEST_CASE_HEAD(duplicate) +{ + set_md_var("descr", "Tests the duplicate function"); +} +ATF_TEST_CASE_BODY(duplicate) +{ + using tools::text::duplicate; + + const char* orig = "foo"; + + char* copy = duplicate(orig); + ATF_REQUIRE_EQ(std::strlen(copy), 3); + ATF_REQUIRE(std::strcmp(copy, "foo") == 0); + + std::strcpy(copy, "bar"); + ATF_REQUIRE(std::strcmp(copy, "bar") == 0); + ATF_REQUIRE(std::strcmp(orig, "foo") == 0); +} + +ATF_TEST_CASE(join); +ATF_TEST_CASE_HEAD(join) +{ + set_md_var("descr", "Tests the join function"); +} +ATF_TEST_CASE_BODY(join) +{ + using tools::text::join; + + // First set of tests using a non-sorted collection, std::vector. + { + std::vector< std::string > words; + std::string str; + + words.clear(); + str = join(words, ","); + ATF_REQUIRE_EQ(str, ""); + + words.clear(); + words.push_back(""); + str = join(words, ","); + ATF_REQUIRE_EQ(str, ""); + + words.clear(); + words.push_back(""); + words.push_back(""); + str = join(words, ","); + ATF_REQUIRE_EQ(str, ","); + + words.clear(); + words.push_back("foo"); + words.push_back(""); + words.push_back("baz"); + str = join(words, ","); + ATF_REQUIRE_EQ(str, "foo,,baz"); + + words.clear(); + words.push_back("foo"); + words.push_back("bar"); + words.push_back("baz"); + str = join(words, ","); + ATF_REQUIRE_EQ(str, "foo,bar,baz"); + } + + // Second set of tests using a sorted collection, std::set. + { + std::set< std::string > words; + std::string str; + + words.clear(); + str = join(words, ","); + ATF_REQUIRE_EQ(str, ""); + + words.clear(); + words.insert(""); + str = join(words, ","); + ATF_REQUIRE_EQ(str, ""); + + words.clear(); + words.insert("foo"); + words.insert(""); + words.insert("baz"); + str = join(words, ","); + ATF_REQUIRE_EQ(str, ",baz,foo"); + + words.clear(); + words.insert("foo"); + words.insert("bar"); + words.insert("baz"); + str = join(words, ","); + ATF_REQUIRE_EQ(str, "bar,baz,foo"); + } +} + +ATF_TEST_CASE(match); +ATF_TEST_CASE_HEAD(match) +{ + set_md_var("descr", "Tests the match function"); +} +ATF_TEST_CASE_BODY(match) +{ + using tools::text::match; + + ATF_REQUIRE_THROW(std::runtime_error, match("", "[")); + + ATF_REQUIRE(match("", "")); + ATF_REQUIRE(!match("foo", "")); + + ATF_REQUIRE(match("", ".*")); + ATF_REQUIRE(match("", "[a-z]*")); + + ATF_REQUIRE(match("hello", "hello")); + ATF_REQUIRE(match("hello", "[a-z]+")); + ATF_REQUIRE(match("hello", "^[a-z]+$")); + + ATF_REQUIRE(!match("hello", "helooo")); + ATF_REQUIRE(!match("hello", "[a-z]+5")); + ATF_REQUIRE(!match("hello", "^ [a-z]+$")); +} + +ATF_TEST_CASE(split); +ATF_TEST_CASE_HEAD(split) +{ + set_md_var("descr", "Tests the split function"); +} +ATF_TEST_CASE_BODY(split) +{ + using tools::text::split; + + std::vector< std::string > words; + + words = split("", " "); + ATF_REQUIRE_EQ(words.size(), 0); + + words = split(" ", " "); + ATF_REQUIRE_EQ(words.size(), 0); + + words = split(" ", " "); + ATF_REQUIRE_EQ(words.size(), 0); + + words = split("a b", " "); + ATF_REQUIRE_EQ(words.size(), 2); + ATF_REQUIRE_EQ(words[0], "a"); + ATF_REQUIRE_EQ(words[1], "b"); + + words = split("a b c d", " "); + ATF_REQUIRE_EQ(words.size(), 4); + ATF_REQUIRE_EQ(words[0], "a"); + ATF_REQUIRE_EQ(words[1], "b"); + ATF_REQUIRE_EQ(words[2], "c"); + ATF_REQUIRE_EQ(words[3], "d"); + + words = split("foo bar", " "); + ATF_REQUIRE_EQ(words.size(), 2); + ATF_REQUIRE_EQ(words[0], "foo"); + ATF_REQUIRE_EQ(words[1], "bar"); + + words = split("foo bar baz foobar", " "); + ATF_REQUIRE_EQ(words.size(), 4); + ATF_REQUIRE_EQ(words[0], "foo"); + ATF_REQUIRE_EQ(words[1], "bar"); + ATF_REQUIRE_EQ(words[2], "baz"); + ATF_REQUIRE_EQ(words[3], "foobar"); + + words = split(" foo bar", " "); + ATF_REQUIRE_EQ(words.size(), 2); + ATF_REQUIRE_EQ(words[0], "foo"); + ATF_REQUIRE_EQ(words[1], "bar"); + + words = split("foo bar", " "); + ATF_REQUIRE_EQ(words.size(), 2); + ATF_REQUIRE_EQ(words[0], "foo"); + ATF_REQUIRE_EQ(words[1], "bar"); + + words = split("foo bar ", " "); + ATF_REQUIRE_EQ(words.size(), 2); + ATF_REQUIRE_EQ(words[0], "foo"); + ATF_REQUIRE_EQ(words[1], "bar"); + + words = split(" foo bar ", " "); + ATF_REQUIRE_EQ(words.size(), 2); + ATF_REQUIRE_EQ(words[0], "foo"); + ATF_REQUIRE_EQ(words[1], "bar"); +} + +ATF_TEST_CASE(split_delims); +ATF_TEST_CASE_HEAD(split_delims) +{ + set_md_var("descr", "Tests the split function using different delimiters"); +} +ATF_TEST_CASE_BODY(split_delims) +{ + using tools::text::split; + + std::vector< std::string > words; + + words = split("", "/"); + ATF_REQUIRE_EQ(words.size(), 0); + + words = split(" ", "/"); + ATF_REQUIRE_EQ(words.size(), 1); + ATF_REQUIRE_EQ(words[0], " "); + + words = split(" ", "/"); + ATF_REQUIRE_EQ(words.size(), 1); + ATF_REQUIRE_EQ(words[0], " "); + + words = split("a/b", "/"); + ATF_REQUIRE_EQ(words.size(), 2); + ATF_REQUIRE_EQ(words[0], "a"); + ATF_REQUIRE_EQ(words[1], "b"); + + words = split("aLONGDELIMbcdLONGDELIMef", "LONGDELIM"); + ATF_REQUIRE_EQ(words.size(), 3); + ATF_REQUIRE_EQ(words[0], "a"); + ATF_REQUIRE_EQ(words[1], "bcd"); + ATF_REQUIRE_EQ(words[2], "ef"); +} + +ATF_TEST_CASE(trim); +ATF_TEST_CASE_HEAD(trim) +{ + set_md_var("descr", "Tests the trim function"); +} +ATF_TEST_CASE_BODY(trim) +{ + using tools::text::trim; + + ATF_REQUIRE_EQ(trim(""), ""); + ATF_REQUIRE_EQ(trim(" "), ""); + ATF_REQUIRE_EQ(trim("\t"), ""); + + ATF_REQUIRE_EQ(trim(" foo"), "foo"); + ATF_REQUIRE_EQ(trim("\t foo"), "foo"); + ATF_REQUIRE_EQ(trim(" \tfoo"), "foo"); + ATF_REQUIRE_EQ(trim("foo\t "), "foo"); + ATF_REQUIRE_EQ(trim("foo \t"), "foo"); + + ATF_REQUIRE_EQ(trim("foo bar"), "foo bar"); + ATF_REQUIRE_EQ(trim("\t foo bar"), "foo bar"); + ATF_REQUIRE_EQ(trim(" \tfoo bar"), "foo bar"); + ATF_REQUIRE_EQ(trim("foo bar\t "), "foo bar"); + ATF_REQUIRE_EQ(trim("foo bar \t"), "foo bar"); +} + +ATF_TEST_CASE(to_bool); +ATF_TEST_CASE_HEAD(to_bool) +{ + set_md_var("descr", "Tests the to_string function"); +} +ATF_TEST_CASE_BODY(to_bool) +{ + using tools::text::to_bool; + + ATF_REQUIRE(to_bool("true")); + ATF_REQUIRE(to_bool("TRUE")); + ATF_REQUIRE(to_bool("yes")); + ATF_REQUIRE(to_bool("YES")); + + ATF_REQUIRE(!to_bool("false")); + ATF_REQUIRE(!to_bool("FALSE")); + ATF_REQUIRE(!to_bool("no")); + ATF_REQUIRE(!to_bool("NO")); + + ATF_REQUIRE_THROW(std::runtime_error, to_bool("")); + ATF_REQUIRE_THROW(std::runtime_error, to_bool("tru")); + ATF_REQUIRE_THROW(std::runtime_error, to_bool("true2")); + ATF_REQUIRE_THROW(std::runtime_error, to_bool("fals")); + ATF_REQUIRE_THROW(std::runtime_error, to_bool("false2")); +} + +ATF_TEST_CASE(to_bytes); +ATF_TEST_CASE_HEAD(to_bytes) +{ + set_md_var("descr", "Tests the to_bytes function"); +} +ATF_TEST_CASE_BODY(to_bytes) +{ + using tools::text::to_bytes; + + ATF_REQUIRE_EQ(0, to_bytes("0")); + ATF_REQUIRE_EQ(12345, to_bytes("12345")); + ATF_REQUIRE_EQ(2 * 1024, to_bytes("2k")); + ATF_REQUIRE_EQ(4 * 1024 * 1024, to_bytes("4m")); + ATF_REQUIRE_EQ(int64_t(8) * 1024 * 1024 * 1024, to_bytes("8g")); + ATF_REQUIRE_EQ(int64_t(16) * 1024 * 1024 * 1024 * 1024, to_bytes("16t")); + + ATF_REQUIRE_THROW_RE(std::runtime_error, "Empty", to_bytes("")); + ATF_REQUIRE_THROW_RE(std::runtime_error, "Unknown size unit 'd'", + to_bytes("12d")); + ATF_REQUIRE_THROW(std::runtime_error, to_bytes(" ")); + ATF_REQUIRE_THROW(std::runtime_error, to_bytes(" k")); +} + +ATF_TEST_CASE(to_string); +ATF_TEST_CASE_HEAD(to_string) +{ + set_md_var("descr", "Tests the to_string function"); +} +ATF_TEST_CASE_BODY(to_string) +{ + using tools::text::to_string; + + ATF_REQUIRE_EQ(to_string('a'), "a"); + ATF_REQUIRE_EQ(to_string("a"), "a"); + ATF_REQUIRE_EQ(to_string(5), "5"); +} + +ATF_TEST_CASE(to_type); +ATF_TEST_CASE_HEAD(to_type) +{ + set_md_var("descr", "Tests the to_type function"); +} +ATF_TEST_CASE_BODY(to_type) +{ + using tools::text::to_type; + + ATF_REQUIRE_EQ(to_type< int >("0"), 0); + ATF_REQUIRE_EQ(to_type< int >("1234"), 1234); + ATF_REQUIRE_THROW(std::runtime_error, to_type< int >(" ")); + ATF_REQUIRE_THROW(std::runtime_error, to_type< int >("0 a")); + ATF_REQUIRE_THROW(std::runtime_error, to_type< int >("a")); + + ATF_REQUIRE_EQ(to_type< float >("0.5"), 0.5); + ATF_REQUIRE_EQ(to_type< float >("1234.5"), 1234.5); + ATF_REQUIRE_THROW(std::runtime_error, to_type< float >("0.5 a")); + ATF_REQUIRE_THROW(std::runtime_error, to_type< float >("a")); + + ATF_REQUIRE_EQ(to_type< std::string >("a"), "a"); +} + +// ------------------------------------------------------------------------ +// Main. +// ------------------------------------------------------------------------ + +ATF_INIT_TEST_CASES(tcs) +{ + // Add the test cases for the free functions. + ATF_ADD_TEST_CASE(tcs, duplicate); + ATF_ADD_TEST_CASE(tcs, join); + ATF_ADD_TEST_CASE(tcs, match); + ATF_ADD_TEST_CASE(tcs, split); + ATF_ADD_TEST_CASE(tcs, split_delims); + ATF_ADD_TEST_CASE(tcs, trim); + ATF_ADD_TEST_CASE(tcs, to_bool); + ATF_ADD_TEST_CASE(tcs, to_bytes); + ATF_ADD_TEST_CASE(tcs, to_string); + ATF_ADD_TEST_CASE(tcs, to_type); +} diff --git a/atf-run/timer.cpp b/tools/timers.cpp similarity index 87% rename from atf-run/timer.cpp rename to tools/timers.cpp index 6ed70d97f62c..371a416aa2b1 100644 --- a/atf-run/timer.cpp +++ b/tools/timers.cpp @@ -35,22 +35,18 @@ extern "C" { #include } +#include #include #include #include -extern "C" { -#include "atf-c/defs.h" -} - -#include "atf-c++/detail/exceptions.hpp" -#include "atf-c++/detail/sanity.hpp" - +#include "defs.hpp" +#include "exceptions.hpp" #include "signals.hpp" -#include "timer.hpp" +#include "timers.hpp" -namespace impl = atf::atf_run; -#define IMPL_NAME "atf::atf_run" +namespace impl = tools::timers; +#define IMPL_NAME "tools::timers" #if !defined(HAVE_TIMER_T) static impl::timer* compat_handle; @@ -110,8 +106,8 @@ impl::timer::timer(const unsigned int seconds) : sa.sa_flags = SA_SIGINFO; sa.sa_sigaction = ::handler; if (::sigaction(SIGALRM, &sa, &m_pimpl->m_old_sa) == -1) - throw system_error(IMPL_NAME "::timer::timer", - "Failed to set signal handler", errno); + throw tools::system_error(IMPL_NAME "::timer::timer", + "Failed to set signal handler", errno); #if defined(HAVE_TIMER_T) struct ::sigevent se; @@ -122,8 +118,8 @@ impl::timer::timer(const unsigned int seconds) : se.sigev_notify_attributes = NULL; if (::timer_create(CLOCK_MONOTONIC, &se, &m_pimpl->m_timer) == -1) { ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL); - throw system_error(IMPL_NAME "::timer::timer", - "Failed to create timer", errno); + throw tools::system_error(IMPL_NAME "::timer::timer", + "Failed to create timer", errno); } struct ::itimerspec it; @@ -134,8 +130,8 @@ impl::timer::timer(const unsigned int seconds) : if (::timer_settime(m_pimpl->m_timer, 0, &it, &m_pimpl->m_old_it) == -1) { ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL); ::timer_delete(m_pimpl->m_timer); - throw system_error(IMPL_NAME "::timer::timer", - "Failed to program timer", errno); + throw tools::system_error(IMPL_NAME "::timer::timer", + "Failed to program timer", errno); } #else ::itimerval it; @@ -145,10 +141,10 @@ impl::timer::timer(const unsigned int seconds) : it.it_value.tv_usec = 0; if (::setitimer(ITIMER_REAL, &it, &m_pimpl->m_old_it) == -1) { ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL); - throw system_error(IMPL_NAME "::timer::timer", - "Failed to program timer", errno); + throw tools::system_error(IMPL_NAME "::timer::timer", + "Failed to program timer", errno); } - INV(compat_handle == NULL); + assert(compat_handle == NULL); compat_handle = this; #endif } @@ -158,16 +154,16 @@ impl::timer::~timer(void) #if defined(HAVE_TIMER_T) { const int ret = ::timer_delete(m_pimpl->m_timer); - INV(ret != -1); + assert(ret != -1); } #else { const int ret = ::setitimer(ITIMER_REAL, &m_pimpl->m_old_it, NULL); - INV(ret != -1); + assert(ret != -1); } #endif const int ret = ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL); - INV(ret != -1); + assert(ret != -1); #if !defined(HAVE_TIMER_T) compat_handle = NULL; diff --git a/atf-run/timer.hpp b/tools/timers.hpp similarity index 89% rename from atf-run/timer.hpp rename to tools/timers.hpp index 8eb722840976..bf43ffb03f58 100644 --- a/atf-run/timer.hpp +++ b/tools/timers.hpp @@ -27,8 +27,8 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_RUN_ALARM_HPP_) -#define _ATF_RUN_ALARM_HPP_ +#if !defined(TOOLS_TIMERS_HPP) +#define TOOLS_TIMERS_HPP extern "C" { #include @@ -36,10 +36,8 @@ extern "C" { #include -#include "atf-c++/noncopyable.hpp" - -namespace atf { -namespace atf_run { +namespace tools { +namespace timers { class signal_programmer; @@ -47,7 +45,11 @@ class signal_programmer; // The "timer" class. // ------------------------------------------------------------------------ -class timer : noncopyable { +class timer { + // Non-copyable. + timer(const timer&); + timer& operator=(const timer&); + struct impl; std::auto_ptr< impl > m_pimpl; @@ -75,7 +77,7 @@ class child_timer : public timer { void timeout_callback(void); }; -} // namespace atf_run -} // namespace atf +} // namespace timers +} // namespace tools -#endif // !defined(_ATF_RUN_ALARM_HPP_) +#endif // !defined(TOOLS_TIMERS_HPP) diff --git a/atf-c++/detail/ui.cpp b/tools/ui.cpp similarity index 89% rename from atf-c++/detail/ui.cpp rename to tools/ui.cpp index 07bde4f87dba..56426ec4863d 100644 --- a/atf-c++/detail/ui.cpp +++ b/tools/ui.cpp @@ -34,16 +34,15 @@ extern "C" { #include } +#include #include #include "env.hpp" #include "text.hpp" -#include "sanity.hpp" -#include "text.hpp" #include "ui.hpp" -namespace impl = atf::ui; -#define IMPL_NAME "atf::ui" +namespace impl = tools::ui; +#define IMPL_NAME "tools::ui" static size_t @@ -53,10 +52,10 @@ terminal_width(void) static size_t width = 0; if (!done) { - if (atf::env::has("COLUMNS")) { - const std::string cols = atf::env::get("COLUMNS"); + if (tools::env::has("COLUMNS")) { + const std::string cols = tools::env::get("COLUMNS"); if (cols.length() > 0) { - width = atf::text::to_type< size_t >(cols); + width = tools::text::to_type< size_t >(cols); } } else { struct winsize ws; @@ -81,7 +80,7 @@ format_paragraph(const std::string& text, const bool repeat, const size_t col) { - PRE(text.find('\n') == std::string::npos); + assert(text.find('\n') == std::string::npos); const std::string pad(col - tag.length(), ' '); const std::string fullpad(col, ' '); @@ -91,12 +90,12 @@ format_paragraph(const std::string& text, formatted = tag + pad; else formatted = fullpad; - INV(formatted.length() == col); + assert(formatted.length() == col); size_t curcol = col; const size_t maxcol = terminal_width(); - std::vector< std::string > words = atf::text::split(text, " "); + std::vector< std::string > words = tools::text::split(text, " "); for (std::vector< std::string >::const_iterator iter = words.begin(); iter != words.end(); iter++) { const std::string& word = *iter; @@ -142,13 +141,13 @@ std::string impl::format_text_with_tag(const std::string& text, const std::string& tag, bool repeat, size_t col) { - PRE(col == 0 || col >= tag.length()); + assert(col == 0 || col >= tag.length()); if (col == 0) col = tag.length(); std::string formatted; - std::vector< std::string > lines = atf::text::split(text, "\n"); + std::vector< std::string > lines = tools::text::split(text, "\n"); for (std::vector< std::string >::const_iterator iter = lines.begin(); iter != lines.end(); iter++) { const std::string& line = *iter; diff --git a/atf-c++/detail/ui.hpp b/tools/ui.hpp similarity index 96% rename from atf-c++/detail/ui.hpp rename to tools/ui.hpp index 1c81c56a963d..4e0e4318be96 100644 --- a/atf-c++/detail/ui.hpp +++ b/tools/ui.hpp @@ -27,12 +27,12 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_CXX_UI_HPP_) -#define _ATF_CXX_UI_HPP_ +#if !defined(TOOLS_UI_HPP) +#define TOOLS_UI_HPP #include -namespace atf { +namespace tools { namespace ui { //! @@ -100,6 +100,6 @@ std::string format_text_with_tag(const std::string&, const std::string&, std::string format_warning(const std::string&, const std::string&); } // namespace ui -} // namespace atf +} // namespace tools -#endif // !defined(_ATF_CXX_UI_HPP_) +#endif // !defined(TOOLS_UI_HPP) diff --git a/atf-c++/detail/ui_test.cpp b/tools/ui_test.cpp similarity index 98% rename from atf-c++/detail/ui_test.cpp rename to tools/ui_test.cpp index 918d028de150..e4d9050eab9e 100644 --- a/atf-c++/detail/ui_test.cpp +++ b/tools/ui_test.cpp @@ -30,7 +30,7 @@ #include #include -#include "../macros.hpp" +#include #include "env.hpp" #include "ui.hpp" @@ -363,7 +363,7 @@ run_tests(const char *tc) std::cout << "Running tests for " << tc << "\n"; - atf::env::set("COLUMNS", "15"); + tools::env::set("COLUMNS", "15"); for (t = &tests[0]; t->tc != NULL; t++) { if (std::strcmp(t->tc, tc) == 0) { @@ -374,7 +374,7 @@ run_tests(const char *tc) std::cout << "Input: >>>" << t->fmt << "<<<\n"; std::cout << "Expected output: >>>" << t->result << "<<<\n"; - std::string result = atf::ui::format_text_with_tag(t->fmt, t->tag, + std::string result = tools::ui::format_text_with_tag(t->fmt, t->tag, t->repeat, t->col); std::cout << "Output : >>>" << result << "<<<\n"; ATF_REQUIRE_EQ(t->result, result); diff --git a/atf-run/user.cpp b/tools/user.cpp similarity index 80% rename from atf-run/user.cpp rename to tools/user.cpp index 37329f166676..85d7e501d10a 100644 --- a/atf-run/user.cpp +++ b/tools/user.cpp @@ -28,28 +28,27 @@ // extern "C" { +#include #include +#include #include #include - -#include "../atf-c/detail/user.h" } +#include #include #include -#include "../atf-c++/detail/sanity.hpp" - #include "user.hpp" -namespace impl = atf::atf_run; -#define IMPL_NAME "atf::atf_run" +namespace impl = tools::user; +#define IMPL_NAME "tools::user" uid_t impl::euid(void) { - return atf_user_euid(); + return ::geteuid(); } void @@ -73,17 +72,31 @@ impl::get_user_ids(const std::string& user) bool impl::is_member_of_group(gid_t gid) { - return atf_user_is_member_of_group(gid); + static gid_t groups[NGROUPS_MAX]; + static int ngroups = -1; + bool found; + int i; + + if (ngroups == -1) { + ngroups = getgroups(NGROUPS_MAX, groups); + assert(ngroups >= 0); + } + + found = false; + for (i = 0; !found && i < ngroups; i++) + if (groups[i] == gid) + found = true; + return found; } bool impl::is_root(void) { - return atf_user_is_root(); + return ::geteuid() == 0; } bool impl::is_unprivileged(void) { - return atf_user_is_unprivileged(); + return ::geteuid() != 0; } diff --git a/atf-run/user.hpp b/tools/user.hpp similarity index 90% rename from atf-run/user.hpp rename to tools/user.hpp index 11b3e5546d36..1758eb01a543 100644 --- a/atf-run/user.hpp +++ b/tools/user.hpp @@ -27,8 +27,8 @@ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#if !defined(_ATF_RUN_USER_HPP_) -#define _ATF_RUN_USER_HPP_ +#if !defined(TOOLS_USER_HPP) +#define TOOLS_USER_HPP extern "C" { #include @@ -36,8 +36,8 @@ extern "C" { #include -namespace atf { -namespace atf_run { +namespace tools { +namespace user { uid_t euid(void); void drop_privileges(const std::pair< int, int >); @@ -46,7 +46,7 @@ bool is_member_of_group(gid_t); bool is_root(void); bool is_unprivileged(void); -} // namespace atf_run -} // namespace atf +} // namespace user +} // namespace tools -#endif // !defined(_ATF_RUN_USER_HPP_) +#endif // !defined(TOOLS_USER_HPP) diff --git a/atf-run/user_test.cpp b/tools/user_test.cpp similarity index 95% rename from atf-run/user_test.cpp rename to tools/user_test.cpp index 7218ba6553b5..4c385d311ee8 100644 --- a/atf-run/user_test.cpp +++ b/tools/user_test.cpp @@ -37,7 +37,7 @@ extern "C" { #include #include -#include "../atf-c++/macros.hpp" +#include #include "user.hpp" @@ -52,7 +52,7 @@ ATF_TEST_CASE_HEAD(euid) } ATF_TEST_CASE_BODY(euid) { - using atf::atf_run::euid; + using tools::user::euid; ATF_REQUIRE_EQ(euid(), ::geteuid()); } @@ -64,7 +64,7 @@ ATF_TEST_CASE_HEAD(is_member_of_group) } ATF_TEST_CASE_BODY(is_member_of_group) { - using atf::atf_run::is_member_of_group; + using tools::user::is_member_of_group; std::set< gid_t > groups; gid_t maxgid = 0; @@ -109,7 +109,7 @@ ATF_TEST_CASE_HEAD(is_root) } ATF_TEST_CASE_BODY(is_root) { - using atf::atf_run::is_root; + using tools::user::is_root; if (::geteuid() == 0) { ATF_REQUIRE(is_root()); @@ -125,7 +125,7 @@ ATF_TEST_CASE_HEAD(is_unprivileged) } ATF_TEST_CASE_BODY(is_unprivileged) { - using atf::atf_run::is_unprivileged; + using tools::user::is_unprivileged; if (::geteuid() != 0) { ATF_REQUIRE(is_unprivileged()); diff --git a/atf-run/zero_tcs_helper.c b/tools/zero_tcs_helper.c similarity index 100% rename from atf-run/zero_tcs_helper.c rename to tools/zero_tcs_helper.c From 9b3afb9f3c00ca9da97167e29f437bdd3036da1a Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Fri, 14 Feb 2014 14:44:03 +0000 Subject: [PATCH 2/2] Import atf-0.20: Experimental version released on February 7th, 2014. This is the first release without the code for the deprecated tools. If you require such code, please fetch a copy of the 0.19 release and extract the 'tools' directory for your own consumption. * Removed the deprecated tools. This includes atf-config, atf-report, atf-run and atf-version. --- Atffile | 10 - INSTALL | 43 - Kyuafile | 4 - Makefile.am | 44 - Makefile.in | 2102 ++-------------------- NEWS | 13 + README | 25 +- aclocal.m4 | 1 - admin/check-style.sh | 2 +- atf-c++/Atffile | 14 - atf-c++/Makefile.am.inc | 3 +- atf-c++/detail/Atffile | 11 - atf-c++/detail/Makefile.am.inc | 3 +- atf-c/Atffile | 16 - atf-c/Makefile.am.inc | 5 +- atf-c/detail/Atffile | 13 - atf-c/detail/Makefile.am.inc | 3 +- atf-sh/Atffile | 11 - atf-sh/Makefile.am.inc | 3 +- bconfig.h.in | 3 - bootstrap/Makefile.am.inc | 17 +- bootstrap/h_app_empty.cpp | 62 - bootstrap/h_app_opts_args.cpp | 102 -- bootstrap/package.m4 | 5 +- bootstrap/t_application_help.at | 40 - bootstrap/t_application_opts_args.at | 86 - bootstrap/t_atf_config.at | 108 -- bootstrap/t_atf_run.at | 178 -- bootstrap/testsuite | 2487 +------------------------- bootstrap/testsuite.at | 7 - configure | 301 +--- configure.ac | 58 +- m4/module-signals.m4 | 86 - test-programs/Atffile | 9 - test-programs/Makefile.am.inc | 3 +- tools/Atffile | 25 - tools/Kyuafile | 24 - tools/Makefile.am.inc | 332 ---- tools/application.cpp | 317 ---- tools/application.hpp | 113 -- tools/application_test.cpp | 94 - tools/atf-config.1 | 184 -- tools/atf-config.cpp | 140 -- tools/atf-config_test.sh | 180 -- tools/atf-formats.5 | 231 --- tools/atf-report.1 | 168 -- tools/atf-report.cpp | 710 -------- tools/atf-report_test.sh | 449 ----- tools/atf-run.1 | 202 --- tools/atf-run.cpp | 567 ------ tools/atf-run_test.sh | 1134 ------------ tools/atf-version.1 | 56 - tools/atf-version.cpp | 91 - tools/atf.7.in | 192 -- tools/atffile.cpp | 348 ---- tools/atffile.hpp | 92 - tools/atffile_test.cpp | 636 ------- tools/auto_array.hpp | 179 -- tools/auto_array_test.cpp | 303 ---- tools/bad_metadata_helper.c | 38 - tools/config.cpp | 135 -- tools/config.hpp | 75 - tools/config_file.cpp | 223 --- tools/config_file.hpp | 66 - tools/config_file_test.cpp | 395 ---- tools/config_test.cpp | 221 --- tools/defs.hpp.in | 37 - tools/env.cpp | 102 -- tools/env.hpp | 84 - tools/env_test.cpp | 91 - tools/exceptions.cpp | 74 - tools/exceptions.hpp | 93 - tools/expand.cpp | 81 - tools/expand.hpp | 82 - tools/expand_test.cpp | 272 --- tools/expect_helpers.c | 193 -- tools/fail_helper.cpp | 45 - tools/fs.cpp | 744 -------- tools/fs.hpp | 377 ---- tools/fs_test.cpp | 743 -------- tools/generate-revision.sh | 142 -- tools/io.cpp | 356 ---- tools/io.hpp | 436 ----- tools/io_test.cpp | 471 ----- tools/misc_helpers.cpp | 448 ----- tools/parser.cpp | 384 ---- tools/parser.hpp | 607 ------- tools/parser_test.cpp | 1043 ----------- tools/pass_helper.cpp | 44 - tools/process.cpp | 492 ----- tools/process.hpp | 324 ---- tools/process_helpers.c | 117 -- tools/process_test.cpp | 360 ---- tools/reader.cpp | 440 ----- tools/reader.hpp | 89 - tools/reader_test.cpp | 987 ---------- tools/requirements.cpp | 325 ---- tools/requirements.hpp | 47 - tools/requirements_test.cpp | 400 ----- tools/sample/atf-run.hooks | 23 - tools/sample/common.conf | 11 - tools/several_tcs_helper.c | 67 - tools/share/atf-run.hooks | 94 - tools/signals.cpp | 146 -- tools/signals.hpp | 92 - tools/signals_test.cpp | 275 --- tools/test-program.cpp | 790 -------- tools/test-program.hpp | 157 -- tools/test_helpers.hpp | 116 -- tools/test_program_test.cpp | 1023 ----------- tools/tests-results.css | 199 --- tools/tests-results.dtd | 61 - tools/tests-results.xsl | 564 ------ tools/text.cpp | 158 -- tools/text.hpp | 153 -- tools/text_test.cpp | 390 ---- tools/timers.cpp | 211 --- tools/timers.hpp | 83 - tools/ui.cpp | 172 -- tools/ui.hpp | 105 -- tools/ui_test.cpp | 462 ----- tools/user.cpp | 102 -- tools/user.hpp | 52 - tools/user_test.cpp | 148 -- tools/zero_tcs_helper.c | 36 - 125 files changed, 159 insertions(+), 29859 deletions(-) delete mode 100644 Atffile delete mode 100644 atf-c++/Atffile delete mode 100644 atf-c++/detail/Atffile delete mode 100644 atf-c/Atffile delete mode 100644 atf-c/detail/Atffile delete mode 100644 atf-sh/Atffile delete mode 100644 bootstrap/h_app_empty.cpp delete mode 100644 bootstrap/h_app_opts_args.cpp delete mode 100644 bootstrap/t_application_help.at delete mode 100644 bootstrap/t_application_opts_args.at delete mode 100644 bootstrap/t_atf_config.at delete mode 100644 bootstrap/t_atf_run.at delete mode 100644 m4/module-signals.m4 delete mode 100644 test-programs/Atffile delete mode 100644 tools/Atffile delete mode 100644 tools/Kyuafile delete mode 100644 tools/Makefile.am.inc delete mode 100644 tools/application.cpp delete mode 100644 tools/application.hpp delete mode 100644 tools/application_test.cpp delete mode 100644 tools/atf-config.1 delete mode 100644 tools/atf-config.cpp delete mode 100755 tools/atf-config_test.sh delete mode 100644 tools/atf-formats.5 delete mode 100644 tools/atf-report.1 delete mode 100644 tools/atf-report.cpp delete mode 100755 tools/atf-report_test.sh delete mode 100644 tools/atf-run.1 delete mode 100644 tools/atf-run.cpp delete mode 100755 tools/atf-run_test.sh delete mode 100644 tools/atf-version.1 delete mode 100644 tools/atf-version.cpp delete mode 100644 tools/atf.7.in delete mode 100644 tools/atffile.cpp delete mode 100644 tools/atffile.hpp delete mode 100644 tools/atffile_test.cpp delete mode 100644 tools/auto_array.hpp delete mode 100644 tools/auto_array_test.cpp delete mode 100644 tools/bad_metadata_helper.c delete mode 100644 tools/config.cpp delete mode 100644 tools/config.hpp delete mode 100644 tools/config_file.cpp delete mode 100644 tools/config_file.hpp delete mode 100644 tools/config_file_test.cpp delete mode 100644 tools/config_test.cpp delete mode 100644 tools/defs.hpp.in delete mode 100644 tools/env.cpp delete mode 100644 tools/env.hpp delete mode 100644 tools/env_test.cpp delete mode 100644 tools/exceptions.cpp delete mode 100644 tools/exceptions.hpp delete mode 100644 tools/expand.cpp delete mode 100644 tools/expand.hpp delete mode 100644 tools/expand_test.cpp delete mode 100644 tools/expect_helpers.c delete mode 100644 tools/fail_helper.cpp delete mode 100644 tools/fs.cpp delete mode 100644 tools/fs.hpp delete mode 100644 tools/fs_test.cpp delete mode 100755 tools/generate-revision.sh delete mode 100644 tools/io.cpp delete mode 100644 tools/io.hpp delete mode 100644 tools/io_test.cpp delete mode 100644 tools/misc_helpers.cpp delete mode 100644 tools/parser.cpp delete mode 100644 tools/parser.hpp delete mode 100644 tools/parser_test.cpp delete mode 100644 tools/pass_helper.cpp delete mode 100644 tools/process.cpp delete mode 100644 tools/process.hpp delete mode 100644 tools/process_helpers.c delete mode 100644 tools/process_test.cpp delete mode 100644 tools/reader.cpp delete mode 100644 tools/reader.hpp delete mode 100644 tools/reader_test.cpp delete mode 100644 tools/requirements.cpp delete mode 100644 tools/requirements.hpp delete mode 100644 tools/requirements_test.cpp delete mode 100644 tools/sample/atf-run.hooks delete mode 100644 tools/sample/common.conf delete mode 100644 tools/several_tcs_helper.c delete mode 100644 tools/share/atf-run.hooks delete mode 100644 tools/signals.cpp delete mode 100644 tools/signals.hpp delete mode 100644 tools/signals_test.cpp delete mode 100644 tools/test-program.cpp delete mode 100644 tools/test-program.hpp delete mode 100644 tools/test_helpers.hpp delete mode 100644 tools/test_program_test.cpp delete mode 100644 tools/tests-results.css delete mode 100644 tools/tests-results.dtd delete mode 100644 tools/tests-results.xsl delete mode 100644 tools/text.cpp delete mode 100644 tools/text.hpp delete mode 100644 tools/text_test.cpp delete mode 100644 tools/timers.cpp delete mode 100644 tools/timers.hpp delete mode 100644 tools/ui.cpp delete mode 100644 tools/ui.hpp delete mode 100644 tools/ui_test.cpp delete mode 100644 tools/user.cpp delete mode 100644 tools/user.hpp delete mode 100644 tools/user_test.cpp delete mode 100644 tools/zero_tcs_helper.c diff --git a/Atffile b/Atffile deleted file mode 100644 index 4d7aed7756de..000000000000 --- a/Atffile +++ /dev/null @@ -1,10 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: atf-c -tp: atf-c++ -tp: atf-sh -tp: test-programs - -tp-glob: tools* diff --git a/INSTALL b/INSTALL index 29eb48f6cdea..1f50bd860c32 100644 --- a/INSTALL +++ b/INSTALL @@ -94,14 +94,6 @@ The most common, standard flags given to 'configure' are: Specifies where the program (binaries and all associated files) will be installed. -* --sysconfdir=directory - Possible values: Any path - Default: /usr/local/etc - - Specifies where the installed programs will look for configuration files. - '/atf' will be appended to the given path unless ATF_CONFSUBDIR is - redefined as explained later on. - * --help Shows information about all available flags and exits immediately, without running any configuration tasks. @@ -152,14 +144,6 @@ script: Specifies the C++ compiler flags that ATF will use at run time whenever the build-time-specific checks are used. -* ATF_CONFSUBDIR - Possible values: empty, a relative path. - Default: atf. - - Specifies the subdirectory of the configuration directory (given by the - --sysconfdir argument) under which ATF will search for its configuration - files. - * ATF_SHELL Possible values: empty, absolute path to a POSIX shell interpreter. Default: empty. @@ -177,14 +161,6 @@ script: and work directories for test cases. This is just a default and can be overriden at run time. -* GDB - Possible values: empty, absolute path to GNU GDB. - Default: empty. - - Specifies the path to the GNU GDB binary that atf-run will use to gather - a stack trace of a crashing test program. If empty, the configure script - will try to find a suitable binary for you. - The following flags are specific to ATF's 'configure' script: * --enable-developer @@ -199,25 +175,6 @@ The following flags are specific to ATF's 'configure' script: detection features regardless of the value of this flag. However, such warnings are only fatal when --enable-developer is 'yes'. -* --enable-tools - Possible values: yes, no - Default: no. - - Enables the build of the deprecated atf-config, atf-report, atf-run - and atf-version tools. atf-report and atf-run have been superseded by - Kyua, and atf-config and atf-version are unnecessary. - - -Post-installation steps -*********************** - -After installing ATF, you have to register the DTDs it provides into the -system-wide XML catalog. See the comments at the top of the files in -${datadir}/share/xml/atf to see the correct public identifiers. This -directory will typically be /usr/local/share/xml/atf or /usr/share/xml/atf. -Failure to do so will lead to further errors when processing the XML files -generated by atf-report. - =========================================================================== vim: filetype=text:textwidth=75:expandtab:shiftwidth=2:softtabstop=2 diff --git a/Kyuafile b/Kyuafile index 77125974a406..a65bb537d91e 100644 --- a/Kyuafile +++ b/Kyuafile @@ -6,7 +6,3 @@ include("atf-c/Kyuafile") include("atf-c++/Kyuafile") include("atf-sh/Kyuafile") include("test-programs/Kyuafile") - -if fs.exists("tools/Kyuafile") then - include("tools/Kyuafile") -end diff --git a/Makefile.am b/Makefile.am index f90fc9949fd6..6187080fb304 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,6 @@ atf_aclocal_DATA = BUILT_SOURCES = CLEANFILES = -DIST_HOOKS = EXTRA_DIST = bin_PROGRAMS = dist_man_MANS = @@ -54,10 +53,6 @@ include bootstrap/Makefile.am.inc include doc/Makefile.am.inc include test-programs/Makefile.am.inc -if ENABLE_TOOLS -include tools/Makefile.am.inc -endif - # # Top-level distfile documents. # @@ -76,32 +71,9 @@ TESTS_ENVIRONMENT = PATH=$(prefix)/bin:$${PATH} \ testsdir = $(exec_prefix)/tests pkgtestsdir = $(testsdir)/$(PACKAGE) -if ENABLE_TOOLS -INSTALLCHECK_TARGETS += installcheck-atf -PHONY_TARGETS += installcheck-atf -installcheck-atf: - logfile=$$(pwd)/installcheck.log; \ - fifofile=$$(pwd)/installcheck.fifo; \ - cd $(pkgtestsdir); \ - rm -f $${fifofile}; \ - mkfifo $${fifofile}; \ - cat $${fifofile} | tee $${logfile} | $(TESTS_ENVIRONMENT) atf-report & \ - $(TESTS_ENVIRONMENT) atf-run >>$${fifofile}; \ - res=$${?}; \ - wait; \ - rm $${fifofile}; \ - echo; \ - echo "The verbatim output of atf-run has been saved to" \ - "installcheck.log; exit was $${res}"; \ - test $${res} -eq 0 -CLEANFILES += installcheck.fifo installcheck.log -endif - PHONY_TARGETS += installcheck-kyua if HAVE_KYUA -if !ENABLE_TOOLS INSTALLCHECK_TARGETS += installcheck-kyua -endif installcheck-kyua: cd $(pkgtestsdir) && $(TESTS_ENVIRONMENT) $(KYUA) test endif @@ -109,9 +81,6 @@ endif installcheck-local: $(INSTALLCHECK_TARGETS) pkgtests_DATA = Kyuafile -if ENABLE_TOOLS -pkgtests_DATA += Atffile -endif EXTRA_DIST += $(pkgtests_DATA) BUILD_SH_TP = \ @@ -124,17 +93,6 @@ BUILD_SH_TP = \ # Custom targets. # -DIST_HOOKS += forbid-dist -if ENABLE_TOOLS -forbid-dist: - @true -else -forbid-dist: - @echo "Sorry; cannot make dist without the tools enabled." - @echo "Please reconfigure with --enable-tools." - @false -endif - PHONY_TARGETS += clean-all clean-all: GIT="$(GIT)" $(SH) $(srcdir)/admin/clean-all.sh @@ -149,6 +107,4 @@ release-test: .PHONY: $(PHONY_TARGETS) -dist-hook: $(DIST_HOOKS) - # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/Makefile.in b/Makefile.in index a98fc3570567..c8f9d68515e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -304,36 +304,6 @@ # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - - @@ -403,7 +373,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = atf-sh/atf-sh$(EXEEXT) $(am__EXEEXT_1) +bin_PROGRAMS = atf-sh/atf-sh$(EXEEXT) libexec_PROGRAMS = atf-sh/atf-check$(EXEEXT) DIST_COMMON = $(srcdir)/admin/Makefile.am.inc \ $(srcdir)/atf-c/Makefile.am.inc \ @@ -413,17 +383,16 @@ DIST_COMMON = $(srcdir)/admin/Makefile.am.inc \ $(srcdir)/atf-sh/Makefile.am.inc \ $(srcdir)/bootstrap/Makefile.am.inc \ $(srcdir)/doc/Makefile.am.inc \ - $(srcdir)/test-programs/Makefile.am.inc \ - $(srcdir)/tools/Makefile.am.inc $(srcdir)/Makefile.in \ + $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/bconfig.h.in \ - $(top_srcdir)/atf-c/defs.h.in $(top_srcdir)/tools/defs.hpp.in \ - $(top_srcdir)/admin/depcomp $(dist_man_MANS) $(atf_c_HEADERS) \ - $(atf_c___HEADERS) $(include_HEADERS) AUTHORS COPYING INSTALL \ - NEWS README admin/ar-lib admin/compile admin/config.guess \ - admin/config.sub admin/depcomp admin/install-sh admin/missing \ - admin/ltmain.sh $(top_srcdir)/admin/ar-lib \ - $(top_srcdir)/admin/compile $(top_srcdir)/admin/config.guess \ + $(top_srcdir)/atf-c/defs.h.in $(top_srcdir)/admin/depcomp \ + $(dist_man_MANS) $(atf_c_HEADERS) $(atf_c___HEADERS) \ + $(include_HEADERS) AUTHORS COPYING INSTALL NEWS README \ + admin/ar-lib admin/compile admin/config.guess admin/config.sub \ + admin/depcomp admin/install-sh admin/missing admin/ltmain.sh \ + $(top_srcdir)/admin/ar-lib $(top_srcdir)/admin/compile \ + $(top_srcdir)/admin/config.guess \ $(top_srcdir)/admin/config.sub $(top_srcdir)/admin/install-sh \ $(top_srcdir)/admin/ltmain.sh $(top_srcdir)/admin/missing tests_atf_c_PROGRAMS = atf-c/atf_c_test$(EXEEXT) \ @@ -454,67 +423,11 @@ tests_atf_c___detail_PROGRAMS = \ atf-c++/detail/sanity_test$(EXEEXT) \ atf-c++/detail/text_test$(EXEEXT) \ atf-c++/detail/version_helper$(EXEEXT) -check_PROGRAMS = bootstrap/h_app_empty$(EXEEXT) \ - bootstrap/h_app_opts_args$(EXEEXT) \ - bootstrap/h_tp_basic_c$(EXEEXT) \ +check_PROGRAMS = bootstrap/h_tp_basic_c$(EXEEXT) \ bootstrap/h_tp_basic_cpp$(EXEEXT) tests_test_programs_PROGRAMS = test-programs/c_helpers$(EXEEXT) \ test-programs/cpp_helpers$(EXEEXT) - -# XXX For some reason, the nodist line above does not work as expected. -# Work this problem around. -@ENABLE_TOOLS_TRUE@am__append_1 = kill-defs-hpp -@ENABLE_TOOLS_TRUE@am__append_2 = tools/atf-config tools/atf-report \ -@ENABLE_TOOLS_TRUE@ tools/atf-run tools/atf-version -@ENABLE_TOOLS_TRUE@am__append_3 = tools/atf-config.1 \ -@ENABLE_TOOLS_TRUE@ tools/atf-report.1 tools/atf-run.1 \ -@ENABLE_TOOLS_TRUE@ tools/atf-version.1 tools/atf-formats.5 -@ENABLE_TOOLS_TRUE@am__append_4 = tools/generate-revision.sh \ -@ENABLE_TOOLS_TRUE@ tools/atf.7.in $(css_DATA) $(dtd_DATA) \ -@ENABLE_TOOLS_TRUE@ $(eg_DATA) $(hooks_DATA) $(xsl_DATA) \ -@ENABLE_TOOLS_TRUE@ $(tests_tools_DATA) \ -@ENABLE_TOOLS_TRUE@ tools/atf-config_test.sh \ -@ENABLE_TOOLS_TRUE@ tools/atf-report_test.sh \ -@ENABLE_TOOLS_TRUE@ tools/atf-run_test.sh -@ENABLE_TOOLS_TRUE@am__append_5 = tools/revision.h -@ENABLE_TOOLS_TRUE@am__append_6 = tools/revision.h \ -@ENABLE_TOOLS_TRUE@ tools/revision.h.stamp tools/atf.7 \ -@ENABLE_TOOLS_TRUE@ tools/atf-config_test tools/atf-report_test \ -@ENABLE_TOOLS_TRUE@ tools/atf-run_test installcheck.fifo \ -@ENABLE_TOOLS_TRUE@ installcheck.log -@ENABLE_TOOLS_TRUE@am__append_7 = tools/revision.h.stamp \ -@ENABLE_TOOLS_TRUE@ installcheck-atf -@ENABLE_TOOLS_TRUE@am__append_8 = tools/atf.7 -@ENABLE_TOOLS_TRUE@tests_tools_PROGRAMS = \ -@ENABLE_TOOLS_TRUE@ tools/application_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/atffile_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/auto_array_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/config_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/config_file_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/env_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/expand_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/expect_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/fail_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/fs_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/io_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/misc_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/parser_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/process_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/pass_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/process_helpers$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/reader_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/requirements_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/several_tcs_helper$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/signals_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/test_program_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/text_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/ui_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/user_test$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper$(EXEEXT) -@ENABLE_TOOLS_TRUE@am__append_9 = installcheck-atf -@ENABLE_TOOLS_FALSE@@HAVE_KYUA_TRUE@am__append_10 = installcheck-kyua -@ENABLE_TOOLS_TRUE@am__append_11 = Atffile +@HAVE_KYUA_TRUE@am__append_1 = installcheck-kyua subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-flags.m4 \ @@ -524,61 +437,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-flags.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/module-application.m4 \ $(top_srcdir)/m4/module-defs.m4 $(top_srcdir)/m4/module-env.m4 \ - $(top_srcdir)/m4/module-fs.m4 \ - $(top_srcdir)/m4/module-signals.m4 \ - $(top_srcdir)/m4/runtime-tool.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/module-fs.m4 $(top_srcdir)/m4/runtime-tool.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = bconfig.h -CONFIG_CLEAN_FILES = atf-c/defs.h tools/defs.hpp +CONFIG_CLEAN_FILES = atf-c/defs.h CONFIG_CLEAN_VPATH_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -AM_V_AR = $(am__v_AR_@AM_V@) -am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -am__v_AR_1 = -tools_libtools_a_AR = $(AR) $(ARFLAGS) -tools_libtools_a_LIBADD = -am__tools_libtools_a_SOURCES_DIST = tools/application.cpp \ - tools/application.hpp tools/atffile.cpp tools/atffile.hpp \ - tools/auto_array.hpp tools/config.cpp tools/config.hpp \ - tools/config_file.cpp tools/config_file.hpp tools/env.cpp \ - tools/env.hpp tools/exceptions.cpp tools/exceptions.hpp \ - tools/expand.cpp tools/expand.hpp tools/fs.cpp tools/fs.hpp \ - tools/io.cpp tools/io.hpp tools/parser.cpp tools/parser.hpp \ - tools/process.cpp tools/process.hpp tools/reader.cpp \ - tools/reader.hpp tools/requirements.cpp tools/requirements.hpp \ - tools/signals.cpp tools/signals.hpp tools/test-program.cpp \ - tools/test-program.hpp tools/test_helpers.hpp tools/text.cpp \ - tools/text.hpp tools/timers.cpp tools/timers.hpp tools/ui.cpp \ - tools/ui.hpp tools/user.cpp tools/user.hpp -am__dirstamp = $(am__leading_dot)dirstamp -@ENABLE_TOOLS_TRUE@am_tools_libtools_a_OBJECTS = tools/tools_libtools_a-application.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-atffile.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-config_file.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-env.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-exceptions.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-expand.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-fs.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-io.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-parser.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-process.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-reader.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-requirements.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-signals.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-test-program.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-text.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-timers.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-ui.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_libtools_a-user.$(OBJEXT) -nodist_tools_libtools_a_OBJECTS = -tools_libtools_a_OBJECTS = $(am_tools_libtools_a_OBJECTS) \ - $(nodist_tools_libtools_a_OBJECTS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -612,29 +480,24 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(tests_atf_c___detaildir)" \ "$(DESTDIR)$(tests_atf_c_detaildir)" \ "$(DESTDIR)$(tests_test_programsdir)" \ - "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(tests_atf_cdir)" \ - "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_shdir)" \ - "$(DESTDIR)$(tests_test_programsdir)" \ - "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" \ + "$(DESTDIR)$(tests_atf_shdir)" \ + "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" \ - "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" \ "$(DESTDIR)$(atf_aclocaldir)" \ "$(DESTDIR)$(atf_c__dirpkgconfigdir)" \ "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" \ - "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(cssdir)" \ - "$(DESTDIR)$(docdir)" "$(DESTDIR)$(dtddir)" \ - "$(DESTDIR)$(egdir)" "$(DESTDIR)$(hooksdir)" \ + "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(docdir)" \ "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" \ "$(DESTDIR)$(tests_atf_c__dir)" \ "$(DESTDIR)$(tests_atf_c___detaildir)" \ "$(DESTDIR)$(tests_atf_c_detaildir)" \ "$(DESTDIR)$(tests_atf_shdir)" \ - "$(DESTDIR)$(tests_test_programsdir)" \ - "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(xsldir)" \ - "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" \ - "$(DESTDIR)$(includedir)" + "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(atf_cdir)" \ + "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) atf_c___detail_libtest_helpers_la_LIBADD = +am__dirstamp = $(am__leading_dot)dirstamp am_atf_c___detail_libtest_helpers_la_OBJECTS = \ atf-c++/detail/test_helpers.lo atf_c___detail_libtest_helpers_la_OBJECTS = \ @@ -679,14 +542,9 @@ libatf_c_la_OBJECTS = $(am_libatf_c_la_OBJECTS) \ libatf_c_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libatf_c_la_LDFLAGS) $(LDFLAGS) -o $@ -@ENABLE_TOOLS_TRUE@am__EXEEXT_1 = tools/atf-config$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/atf-report$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/atf-run$(EXEEXT) \ -@ENABLE_TOOLS_TRUE@ tools/atf-version$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(tests_atf_c_PROGRAMS) \ $(tests_atf_c___PROGRAMS) $(tests_atf_c___detail_PROGRAMS) \ - $(tests_atf_c_detail_PROGRAMS) $(tests_test_programs_PROGRAMS) \ - $(tests_tools_PROGRAMS) + $(tests_atf_c_detail_PROGRAMS) $(tests_test_programs_PROGRAMS) am_atf_c___atf_c___test_OBJECTS = atf-c++/atf_c++_test.$(OBJEXT) atf_c___atf_c___test_OBJECTS = $(am_atf_c___atf_c___test_OBJECTS) atf_c___atf_c___test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \ @@ -860,15 +718,6 @@ atf_sh_atf_check_DEPENDENCIES = $(ATF_CXX_LIBS) am_atf_sh_atf_sh_OBJECTS = atf-sh/atf-sh.$(OBJEXT) atf_sh_atf_sh_OBJECTS = $(am_atf_sh_atf_sh_OBJECTS) atf_sh_atf_sh_DEPENDENCIES = $(ATF_CXX_LIBS) -am_bootstrap_h_app_empty_OBJECTS = bootstrap/h_app_empty.$(OBJEXT) -bootstrap_h_app_empty_OBJECTS = $(am_bootstrap_h_app_empty_OBJECTS) -bootstrap_h_app_empty_DEPENDENCIES = tools/libtools.a $(ATF_CXX_LIBS) -am_bootstrap_h_app_opts_args_OBJECTS = \ - bootstrap/h_app_opts_args.$(OBJEXT) -bootstrap_h_app_opts_args_OBJECTS = \ - $(am_bootstrap_h_app_opts_args_OBJECTS) -bootstrap_h_app_opts_args_DEPENDENCIES = tools/libtools.a \ - $(ATF_CXX_LIBS) am_bootstrap_h_tp_basic_c_OBJECTS = bootstrap/h_tp_basic_c.$(OBJEXT) bootstrap_h_tp_basic_c_OBJECTS = $(am_bootstrap_h_tp_basic_c_OBJECTS) bootstrap_h_tp_basic_c_DEPENDENCIES = libatf-c.la @@ -887,179 +736,8 @@ am_test_programs_cpp_helpers_OBJECTS = \ test_programs_cpp_helpers_OBJECTS = \ $(am_test_programs_cpp_helpers_OBJECTS) test_programs_cpp_helpers_DEPENDENCIES = $(ATF_CXX_LIBS) -am__tools_application_test_SOURCES_DIST = tools/application_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_application_test_OBJECTS = tools/tools_application_test-application_test.$(OBJEXT) -tools_application_test_OBJECTS = $(am_tools_application_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_application_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_atf_config_SOURCES_DIST = tools/atf-config.cpp -@ENABLE_TOOLS_TRUE@am_tools_atf_config_OBJECTS = tools/tools_atf_config-atf-config.$(OBJEXT) -tools_atf_config_OBJECTS = $(am_tools_atf_config_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atf_config_DEPENDENCIES = $(TOOLS_LDADD) -am__tools_atf_report_SOURCES_DIST = tools/atf-report.cpp -@ENABLE_TOOLS_TRUE@am_tools_atf_report_OBJECTS = tools/tools_atf_report-atf-report.$(OBJEXT) -tools_atf_report_OBJECTS = $(am_tools_atf_report_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atf_report_DEPENDENCIES = $(TOOLS_LDADD) -am__tools_atf_run_SOURCES_DIST = tools/atf-run.cpp -@ENABLE_TOOLS_TRUE@am_tools_atf_run_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_atf_run-atf-run.$(OBJEXT) -tools_atf_run_OBJECTS = $(am_tools_atf_run_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atf_run_DEPENDENCIES = $(TOOLS_LDADD) -am__tools_atf_version_SOURCES_DIST = tools/atf-version.cpp -@ENABLE_TOOLS_TRUE@am_tools_atf_version_OBJECTS = tools/tools_atf_version-atf-version.$(OBJEXT) -nodist_tools_atf_version_OBJECTS = -tools_atf_version_OBJECTS = $(am_tools_atf_version_OBJECTS) \ - $(nodist_tools_atf_version_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atf_version_DEPENDENCIES = $(TOOLS_LDADD) -am__tools_atffile_test_SOURCES_DIST = tools/atffile_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_atffile_test_OBJECTS = tools/tools_atffile_test-atffile_test.$(OBJEXT) -tools_atffile_test_OBJECTS = $(am_tools_atffile_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_atffile_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_auto_array_test_SOURCES_DIST = tools/auto_array_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_auto_array_test_OBJECTS = tools/tools_auto_array_test-auto_array_test.$(OBJEXT) -tools_auto_array_test_OBJECTS = $(am_tools_auto_array_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_auto_array_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_bad_metadata_helper_SOURCES_DIST = \ - tools/bad_metadata_helper.c -@ENABLE_TOOLS_TRUE@am_tools_bad_metadata_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/bad_metadata_helper.$(OBJEXT) -tools_bad_metadata_helper_OBJECTS = \ - $(am_tools_bad_metadata_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ libatf-c.la -am__tools_config_file_test_SOURCES_DIST = tools/config_file_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_config_file_test_OBJECTS = tools/tools_config_file_test-config_file_test.$(OBJEXT) -tools_config_file_test_OBJECTS = $(am_tools_config_file_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_config_file_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_config_test_SOURCES_DIST = tools/config_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_config_test_OBJECTS = tools/tools_config_test-config_test.$(OBJEXT) -tools_config_test_OBJECTS = $(am_tools_config_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_config_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_env_test_SOURCES_DIST = tools/env_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_env_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_env_test-env_test.$(OBJEXT) -tools_env_test_OBJECTS = $(am_tools_env_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_env_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_expand_test_SOURCES_DIST = tools/expand_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_expand_test_OBJECTS = tools/tools_expand_test-expand_test.$(OBJEXT) -tools_expand_test_OBJECTS = $(am_tools_expand_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_expand_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_expect_helpers_SOURCES_DIST = tools/expect_helpers.c -@ENABLE_TOOLS_TRUE@am_tools_expect_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/expect_helpers.$(OBJEXT) -tools_expect_helpers_OBJECTS = $(am_tools_expect_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_expect_helpers_DEPENDENCIES = libatf-c.la -am__tools_fail_helper_SOURCES_DIST = tools/fail_helper.cpp -@ENABLE_TOOLS_TRUE@am_tools_fail_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/fail_helper.$(OBJEXT) -tools_fail_helper_OBJECTS = $(am_tools_fail_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_fail_helper_DEPENDENCIES = $(ATF_CXX_LIBS) -am__tools_fs_test_SOURCES_DIST = tools/fs_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_fs_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_fs_test-fs_test.$(OBJEXT) -tools_fs_test_OBJECTS = $(am_tools_fs_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_fs_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_io_test_SOURCES_DIST = tools/io_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_io_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_io_test-io_test.$(OBJEXT) -tools_io_test_OBJECTS = $(am_tools_io_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_io_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_misc_helpers_SOURCES_DIST = tools/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@am_tools_misc_helpers_OBJECTS = tools/tools_misc_helpers-misc_helpers.$(OBJEXT) -tools_misc_helpers_OBJECTS = $(am_tools_misc_helpers_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_misc_helpers_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_parser_test_SOURCES_DIST = tools/parser_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_parser_test_OBJECTS = tools/tools_parser_test-parser_test.$(OBJEXT) -tools_parser_test_OBJECTS = $(am_tools_parser_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_parser_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_pass_helper_SOURCES_DIST = tools/pass_helper.cpp -@ENABLE_TOOLS_TRUE@am_tools_pass_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/pass_helper.$(OBJEXT) -tools_pass_helper_OBJECTS = $(am_tools_pass_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_pass_helper_DEPENDENCIES = $(ATF_CXX_LIBS) -am__tools_process_helpers_SOURCES_DIST = tools/process_helpers.c -@ENABLE_TOOLS_TRUE@am_tools_process_helpers_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/process_helpers.$(OBJEXT) -tools_process_helpers_OBJECTS = $(am_tools_process_helpers_OBJECTS) -tools_process_helpers_LDADD = $(LDADD) -am__tools_process_test_SOURCES_DIST = tools/process_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_process_test_OBJECTS = tools/tools_process_test-process_test.$(OBJEXT) -tools_process_test_OBJECTS = $(am_tools_process_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_process_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_reader_test_SOURCES_DIST = tools/reader_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_reader_test_OBJECTS = tools/tools_reader_test-reader_test.$(OBJEXT) -tools_reader_test_OBJECTS = $(am_tools_reader_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_reader_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_requirements_test_SOURCES_DIST = \ - tools/requirements_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_requirements_test_OBJECTS = tools/tools_requirements_test-requirements_test.$(OBJEXT) -tools_requirements_test_OBJECTS = \ - $(am_tools_requirements_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_requirements_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_several_tcs_helper_SOURCES_DIST = \ - tools/several_tcs_helper.c -@ENABLE_TOOLS_TRUE@am_tools_several_tcs_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/several_tcs_helper.$(OBJEXT) -tools_several_tcs_helper_OBJECTS = \ - $(am_tools_several_tcs_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_several_tcs_helper_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ libatf-c.la -am__tools_signals_test_SOURCES_DIST = tools/signals_test.cpp \ - tools/signals.cpp -@ENABLE_TOOLS_TRUE@am_tools_signals_test_OBJECTS = tools/tools_signals_test-signals_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_signals_test-signals.$(OBJEXT) -tools_signals_test_OBJECTS = $(am_tools_signals_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_signals_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_test_program_test_SOURCES_DIST = \ - tools/test_program_test.cpp -@ENABLE_TOOLS_TRUE@am_tools_test_program_test_OBJECTS = tools/tools_test_program_test-test_program_test.$(OBJEXT) -tools_test_program_test_OBJECTS = \ - $(am_tools_test_program_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_test_program_test_DEPENDENCIES = \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_LDADD) $(ATF_CXX_LIBS) -am__tools_text_test_SOURCES_DIST = tools/text_test.cpp tools/text.cpp -@ENABLE_TOOLS_TRUE@am_tools_text_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_text_test-text_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_text_test-text.$(OBJEXT) -tools_text_test_OBJECTS = $(am_tools_text_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_text_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_ui_test_SOURCES_DIST = tools/ui_test.cpp tools/ui.cpp -@ENABLE_TOOLS_TRUE@am_tools_ui_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_ui_test-ui.$(OBJEXT) -tools_ui_test_OBJECTS = $(am_tools_ui_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_ui_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_user_test_SOURCES_DIST = tools/user_test.cpp tools/user.cpp -@ENABLE_TOOLS_TRUE@am_tools_user_test_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/tools_user_test-user_test.$(OBJEXT) \ -@ENABLE_TOOLS_TRUE@ tools/tools_user_test-user.$(OBJEXT) -tools_user_test_OBJECTS = $(am_tools_user_test_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_user_test_DEPENDENCIES = $(TOOLS_LDADD) \ -@ENABLE_TOOLS_TRUE@ $(ATF_CXX_LIBS) -am__tools_zero_tcs_helper_SOURCES_DIST = tools/zero_tcs_helper.c -@ENABLE_TOOLS_TRUE@am_tools_zero_tcs_helper_OBJECTS = \ -@ENABLE_TOOLS_TRUE@ tools/zero_tcs_helper.$(OBJEXT) -tools_zero_tcs_helper_OBJECTS = $(am_tools_zero_tcs_helper_OBJECTS) -@ENABLE_TOOLS_TRUE@tools_zero_tcs_helper_DEPENDENCIES = libatf-c.la SCRIPTS = $(tests_atf_c_SCRIPTS) $(tests_atf_c___SCRIPTS) \ - $(tests_atf_sh_SCRIPTS) $(tests_test_programs_SCRIPTS) \ - $(tests_tools_SCRIPTS) + $(tests_atf_sh_SCRIPTS) $(tests_test_programs_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -1112,9 +790,7 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(tools_libtools_a_SOURCES) \ - $(nodist_tools_libtools_a_SOURCES) \ - $(atf_c___detail_libtest_helpers_la_SOURCES) \ +SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \ $(atf_c_detail_libtest_helpers_la_SOURCES) \ $(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \ $(nodist_libatf_c_la_SOURCES) $(atf_c___atf_c___test_SOURCES) \ @@ -1147,33 +823,11 @@ SOURCES = $(tools_libtools_a_SOURCES) \ $(atf_c_error_test_SOURCES) $(atf_c_macros_test_SOURCES) \ $(atf_c_tc_test_SOURCES) $(atf_c_tp_test_SOURCES) \ $(atf_c_utils_test_SOURCES) $(atf_sh_atf_check_SOURCES) \ - $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_app_empty_SOURCES) \ - $(bootstrap_h_app_opts_args_SOURCES) \ - $(bootstrap_h_tp_basic_c_SOURCES) \ + $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_tp_basic_c_SOURCES) \ $(bootstrap_h_tp_basic_cpp_SOURCES) \ $(test_programs_c_helpers_SOURCES) \ - $(test_programs_cpp_helpers_SOURCES) \ - $(tools_application_test_SOURCES) $(tools_atf_config_SOURCES) \ - $(tools_atf_report_SOURCES) $(tools_atf_run_SOURCES) \ - $(tools_atf_version_SOURCES) \ - $(nodist_tools_atf_version_SOURCES) \ - $(tools_atffile_test_SOURCES) $(tools_auto_array_test_SOURCES) \ - $(tools_bad_metadata_helper_SOURCES) \ - $(tools_config_file_test_SOURCES) $(tools_config_test_SOURCES) \ - $(tools_env_test_SOURCES) $(tools_expand_test_SOURCES) \ - $(tools_expect_helpers_SOURCES) $(tools_fail_helper_SOURCES) \ - $(tools_fs_test_SOURCES) $(tools_io_test_SOURCES) \ - $(tools_misc_helpers_SOURCES) $(tools_parser_test_SOURCES) \ - $(tools_pass_helper_SOURCES) $(tools_process_helpers_SOURCES) \ - $(tools_process_test_SOURCES) $(tools_reader_test_SOURCES) \ - $(tools_requirements_test_SOURCES) \ - $(tools_several_tcs_helper_SOURCES) \ - $(tools_signals_test_SOURCES) \ - $(tools_test_program_test_SOURCES) $(tools_text_test_SOURCES) \ - $(tools_ui_test_SOURCES) $(tools_user_test_SOURCES) \ - $(tools_zero_tcs_helper_SOURCES) -DIST_SOURCES = $(am__tools_libtools_a_SOURCES_DIST) \ - $(atf_c___detail_libtest_helpers_la_SOURCES) \ + $(test_programs_cpp_helpers_SOURCES) +DIST_SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \ $(atf_c_detail_libtest_helpers_la_SOURCES) \ $(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \ $(atf_c___atf_c___test_SOURCES) $(atf_c___build_test_SOURCES) \ @@ -1205,42 +859,10 @@ DIST_SOURCES = $(am__tools_libtools_a_SOURCES_DIST) \ $(atf_c_error_test_SOURCES) $(atf_c_macros_test_SOURCES) \ $(atf_c_tc_test_SOURCES) $(atf_c_tp_test_SOURCES) \ $(atf_c_utils_test_SOURCES) $(atf_sh_atf_check_SOURCES) \ - $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_app_empty_SOURCES) \ - $(bootstrap_h_app_opts_args_SOURCES) \ - $(bootstrap_h_tp_basic_c_SOURCES) \ + $(atf_sh_atf_sh_SOURCES) $(bootstrap_h_tp_basic_c_SOURCES) \ $(bootstrap_h_tp_basic_cpp_SOURCES) \ $(test_programs_c_helpers_SOURCES) \ - $(test_programs_cpp_helpers_SOURCES) \ - $(am__tools_application_test_SOURCES_DIST) \ - $(am__tools_atf_config_SOURCES_DIST) \ - $(am__tools_atf_report_SOURCES_DIST) \ - $(am__tools_atf_run_SOURCES_DIST) \ - $(am__tools_atf_version_SOURCES_DIST) \ - $(am__tools_atffile_test_SOURCES_DIST) \ - $(am__tools_auto_array_test_SOURCES_DIST) \ - $(am__tools_bad_metadata_helper_SOURCES_DIST) \ - $(am__tools_config_file_test_SOURCES_DIST) \ - $(am__tools_config_test_SOURCES_DIST) \ - $(am__tools_env_test_SOURCES_DIST) \ - $(am__tools_expand_test_SOURCES_DIST) \ - $(am__tools_expect_helpers_SOURCES_DIST) \ - $(am__tools_fail_helper_SOURCES_DIST) \ - $(am__tools_fs_test_SOURCES_DIST) \ - $(am__tools_io_test_SOURCES_DIST) \ - $(am__tools_misc_helpers_SOURCES_DIST) \ - $(am__tools_parser_test_SOURCES_DIST) \ - $(am__tools_pass_helper_SOURCES_DIST) \ - $(am__tools_process_helpers_SOURCES_DIST) \ - $(am__tools_process_test_SOURCES_DIST) \ - $(am__tools_reader_test_SOURCES_DIST) \ - $(am__tools_requirements_test_SOURCES_DIST) \ - $(am__tools_several_tcs_helper_SOURCES_DIST) \ - $(am__tools_signals_test_SOURCES_DIST) \ - $(am__tools_test_program_test_SOURCES_DIST) \ - $(am__tools_text_test_SOURCES_DIST) \ - $(am__tools_ui_test_SOURCES_DIST) \ - $(am__tools_user_test_SOURCES_DIST) \ - $(am__tools_zero_tcs_helper_SOURCES_DIST) + $(test_programs_cpp_helpers_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -1249,17 +871,14 @@ am__can_run_installinfo = \ man1dir = $(mandir)/man1 man3dir = $(mandir)/man3 man4dir = $(mandir)/man4 -man5dir = $(mandir)/man5 -man7dir = $(mandir)/man7 NROFF = nroff MANS = $(dist_man_MANS) $(man_MANS) DATA = $(atf_aclocal_DATA) $(atf_c__dirpkgconfig_DATA) \ $(atf_cpkgconfig_DATA) $(atf_sh_DATA) $(atf_shpkgconfig_DATA) \ - $(css_DATA) $(doc_DATA) $(dtd_DATA) $(eg_DATA) $(hooks_DATA) \ - $(noinst_DATA) $(pkgtests_DATA) $(tests_atf_c_DATA) \ - $(tests_atf_c___DATA) $(tests_atf_c___detail_DATA) \ - $(tests_atf_c_detail_DATA) $(tests_atf_sh_DATA) \ - $(tests_test_programs_DATA) $(tests_tools_DATA) $(xsl_DATA) + $(doc_DATA) $(noinst_DATA) $(pkgtests_DATA) \ + $(tests_atf_c_DATA) $(tests_atf_c___DATA) \ + $(tests_atf_c___detail_DATA) $(tests_atf_c_detail_DATA) \ + $(tests_atf_sh_DATA) $(tests_test_programs_DATA) HEADERS = $(atf_c_HEADERS) $(atf_c___HEADERS) $(include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)bconfig.h.in @@ -1310,7 +929,6 @@ ATF_BUILD_CPP = @ATF_BUILD_CPP@ ATF_BUILD_CPPFLAGS = @ATF_BUILD_CPPFLAGS@ ATF_BUILD_CXX = @ATF_BUILD_CXX@ ATF_BUILD_CXXFLAGS = @ATF_BUILD_CXXFLAGS@ -ATF_CONFSUBDIR = @ATF_CONFSUBDIR@ ATF_SHELL = @ATF_SHELL@ ATF_WORKDIR = @ATF_WORKDIR@ ATTRIBUTE_FORMAT_PRINTF = @ATTRIBUTE_FORMAT_PRINTF@ @@ -1339,10 +957,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENABLE_TOOLS = @ENABLE_TOOLS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GDB = @GDB@ GIT = @GIT@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -1396,14 +1012,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ atf_aclocaldir = @atf_aclocaldir@ -atf_arch = @atf_arch@ -atf_confdir = @atf_confdir@ -atf_cssdir = @atf_cssdir@ -atf_dtddir = @atf_dtddir@ -atf_egdir = @atf_egdir@ -atf_machine = @atf_machine@ atf_pkgconfigdir = @atf_pkgconfigdir@ -atf_xsldir = @atf_xsldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -1451,7 +1060,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ atf_aclocal_DATA = atf-c/atf-common.m4 atf-c/atf-c.m4 \ atf-c++/atf-c++.m4 atf-sh/atf-sh.m4 -BUILT_SOURCES = $(am__append_5) +BUILT_SOURCES = CLEANFILES = atf-c/atf-c.pc atf-c/pkg_config_test atf-c++/atf-c++.pc \ atf-c++/pkg_config_test atf-sh/atf-sh.pc atf-sh/misc_helpers \ atf-sh/atf_check_test atf-sh/atf-check_test atf-sh/config_test \ @@ -1461,15 +1070,7 @@ CLEANFILES = atf-c/atf-c.pc atf-c/pkg_config_test atf-c++/atf-c++.pc \ bootstrap/h_tp_pass test-programs/sh_helpers \ test-programs/config_test test-programs/expect_test \ test-programs/meta_data_test test-programs/result_test \ - test-programs/srcdir_test $(am__append_6) - -# XXX For some reason, the nodist line above does not work as expected. -# Work this problem around. - -# -# Custom targets. -# -DIST_HOOKS = kill-defs-h $(am__append_1) forbid-dist + test-programs/srcdir_test EXTRA_DIST = admin/check-style-common.awk admin/check-style-c.awk \ admin/check-style-cpp.awk admin/check-style-man.awk \ admin/check-style-shell.awk admin/check-style.sh \ @@ -1491,20 +1092,23 @@ EXTRA_DIST = admin/check-style-common.awk admin/check-style-c.awk \ test-programs/sh_helpers.sh test-programs/config_test.sh \ test-programs/expect_test.sh test-programs/meta_data_test.sh \ test-programs/result_test.sh test-programs/srcdir_test.sh \ - $(am__append_4) $(doc_DATA) INSTALL README $(pkgtests_DATA) + $(doc_DATA) INSTALL README $(pkgtests_DATA) dist_man_MANS = atf-c/atf-c-api.3 atf-c++/atf-c++-api.3 \ atf-sh/atf-check.1 atf-sh/atf-sh.1 atf-sh/atf-sh-api.3 \ - doc/atf-test-case.4 doc/atf-test-program.1 $(am__append_3) + doc/atf-test-case.4 doc/atf-test-program.1 include_HEADERS = atf-c.h atf-c++.hpp lib_LTLIBRARIES = libatf-c.la libatf-c++.la -man_MANS = $(am__append_8) +man_MANS = noinst_DATA = INSTALL README noinst_LTLIBRARIES = atf-c/detail/libtest_helpers.la \ atf-c++/detail/libtest_helpers.la -INSTALLCHECK_TARGETS = installcheck-bootstrap $(am__append_9) \ - $(am__append_10) -PHONY_TARGETS = check-style installcheck-bootstrap $(am__append_7) \ - installcheck-kyua clean-all release release-test +INSTALLCHECK_TARGETS = installcheck-bootstrap $(am__append_1) + +# +# Custom targets. +# +PHONY_TARGETS = check-style installcheck-bootstrap installcheck-kyua \ + clean-all release release-test ACLOCAL_AMFLAGS = -I m4 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tools libatf_c_la_SOURCES = atf-c/build.c atf-c/build.h atf-c/check.c \ @@ -1546,8 +1150,7 @@ atf_c_HEADERS = atf-c/build.h \ atf_cdir = $(includedir)/atf-c atf_cpkgconfigdir = $(atf_pkgconfigdir) atf_cpkgconfig_DATA = atf-c/atf-c.pc -tests_atf_c_DATA = atf-c/Atffile \ - atf-c/Kyuafile \ +tests_atf_c_DATA = atf-c/Kyuafile \ atf-c/macros_h_test.c \ atf-c/unused_test.c @@ -1571,9 +1174,7 @@ atf_c_tp_test_SOURCES = atf-c/tp_test.c atf_c_tp_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la atf_c_utils_test_SOURCES = atf-c/utils_test.c atf-c/h_build.h atf_c_utils_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la -tests_atf_c_detail_DATA = atf-c/detail/Atffile \ - atf-c/detail/Kyuafile - +tests_atf_c_detail_DATA = atf-c/detail/Kyuafile tests_atf_c_detaildir = $(pkgtestsdir)/atf-c/detail atf_c_detail_libtest_helpers_la_SOURCES = atf-c/detail/test_helpers.c \ atf-c/detail/test_helpers.h @@ -1623,8 +1224,7 @@ atf_c___HEADERS = atf-c++/build.hpp \ atf_c__dir = $(includedir)/atf-c++ atf_c__dirpkgconfigdir = $(atf_pkgconfigdir) atf_c__dirpkgconfig_DATA = atf-c++/atf-c++.pc -tests_atf_c___DATA = atf-c++/Atffile \ - atf-c++/Kyuafile \ +tests_atf_c___DATA = atf-c++/Kyuafile \ atf-c++/macros_hpp_test.cpp \ atf-c++/unused_test.cpp @@ -1644,9 +1244,7 @@ atf_c___tests_test_SOURCES = atf-c++/tests_test.cpp atf_c___tests_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) atf_c___utils_test_SOURCES = atf-c++/utils_test.cpp atf_c___utils_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS) -tests_atf_c___detail_DATA = atf-c++/detail/Atffile \ - atf-c++/detail/Kyuafile - +tests_atf_c___detail_DATA = atf-c++/detail/Kyuafile tests_atf_c___detaildir = $(pkgtestsdir)/atf-c++/detail atf_c___detail_libtest_helpers_la_SOURCES = atf-c++/detail/test_helpers.cpp \ atf-c++/detail/test_helpers.hpp @@ -1676,18 +1274,12 @@ atf_sh_DATA = atf-sh/libatf-sh.subr atf_shdir = $(pkgdatadir) atf_shpkgconfigdir = $(atf_pkgconfigdir) atf_shpkgconfig_DATA = atf-sh/atf-sh.pc -tests_atf_sh_DATA = atf-sh/Atffile \ - atf-sh/Kyuafile - +tests_atf_sh_DATA = atf-sh/Kyuafile tests_atf_shdir = $(pkgtestsdir)/atf-sh tests_atf_sh_SCRIPTS = atf-sh/misc_helpers atf-sh/atf_check_test \ atf-sh/atf-check_test atf-sh/config_test \ atf-sh/integration_test atf-sh/normalize_test atf-sh/tc_test \ atf-sh/tp_test -bootstrap_h_app_empty_SOURCES = bootstrap/h_app_empty.cpp -bootstrap_h_app_empty_LDADD = tools/libtools.a $(ATF_CXX_LIBS) -bootstrap_h_app_opts_args_SOURCES = bootstrap/h_app_opts_args.cpp -bootstrap_h_app_opts_args_LDADD = tools/libtools.a $(ATF_CXX_LIBS) bootstrap_h_tp_basic_c_SOURCES = bootstrap/h_tp_basic_c.c bootstrap_h_tp_basic_c_LDADD = libatf-c.la bootstrap_h_tp_basic_cpp_SOURCES = bootstrap/h_tp_basic_cpp.cpp @@ -1699,19 +1291,13 @@ DISTCLEANFILES = \ testsuite.lineno \ testsuite.log -testsuite_incs = $(srcdir)/bootstrap/t_application_help.at \ - $(srcdir)/bootstrap/t_application_opts_args.at \ - $(srcdir)/bootstrap/t_atf_config.at \ - $(srcdir)/bootstrap/t_atf_run.at \ - $(srcdir)/bootstrap/t_subr_atf_check.at \ +testsuite_incs = $(srcdir)/bootstrap/t_subr_atf_check.at \ $(srcdir)/bootstrap/t_test_program_compare.at \ $(srcdir)/bootstrap/t_test_program_filter.at \ $(srcdir)/bootstrap/t_test_program_list.at \ $(srcdir)/bootstrap/t_test_program_run.at -tests_test_programs_DATA = test-programs/Atffile \ - test-programs/Kyuafile - +tests_test_programs_DATA = test-programs/Kyuafile tests_test_programsdir = $(pkgtestsdir)/test-programs test_programs_c_helpers_SOURCES = test-programs/c_helpers.c test_programs_c_helpers_LDADD = libatf-c.la @@ -1722,166 +1308,6 @@ tests_test_programs_SCRIPTS = test-programs/sh_helpers \ test-programs/config_test test-programs/expect_test \ test-programs/meta_data_test test-programs/result_test \ test-programs/srcdir_test -@ENABLE_TOOLS_TRUE@TOOLS_CPPFLAGS = -I$(top_srcdir)/tools -I$(top_builddir)/tools -@ENABLE_TOOLS_TRUE@TOOLS_LDADD = tools/libtools.a -@ENABLE_TOOLS_TRUE@noinst_LIBRARIES = tools/libtools.a -@ENABLE_TOOLS_TRUE@tools_libtools_a_SOURCES = tools/application.cpp \ -@ENABLE_TOOLS_TRUE@ tools/application.hpp \ -@ENABLE_TOOLS_TRUE@ tools/atffile.cpp \ -@ENABLE_TOOLS_TRUE@ tools/atffile.hpp \ -@ENABLE_TOOLS_TRUE@ tools/auto_array.hpp \ -@ENABLE_TOOLS_TRUE@ tools/config.cpp \ -@ENABLE_TOOLS_TRUE@ tools/config.hpp \ -@ENABLE_TOOLS_TRUE@ tools/config_file.cpp \ -@ENABLE_TOOLS_TRUE@ tools/config_file.hpp \ -@ENABLE_TOOLS_TRUE@ tools/env.cpp \ -@ENABLE_TOOLS_TRUE@ tools/env.hpp \ -@ENABLE_TOOLS_TRUE@ tools/exceptions.cpp \ -@ENABLE_TOOLS_TRUE@ tools/exceptions.hpp \ -@ENABLE_TOOLS_TRUE@ tools/expand.cpp \ -@ENABLE_TOOLS_TRUE@ tools/expand.hpp \ -@ENABLE_TOOLS_TRUE@ tools/fs.cpp \ -@ENABLE_TOOLS_TRUE@ tools/fs.hpp \ -@ENABLE_TOOLS_TRUE@ tools/io.cpp \ -@ENABLE_TOOLS_TRUE@ tools/io.hpp \ -@ENABLE_TOOLS_TRUE@ tools/parser.cpp \ -@ENABLE_TOOLS_TRUE@ tools/parser.hpp \ -@ENABLE_TOOLS_TRUE@ tools/process.cpp \ -@ENABLE_TOOLS_TRUE@ tools/process.hpp \ -@ENABLE_TOOLS_TRUE@ tools/reader.cpp \ -@ENABLE_TOOLS_TRUE@ tools/reader.hpp \ -@ENABLE_TOOLS_TRUE@ tools/requirements.cpp \ -@ENABLE_TOOLS_TRUE@ tools/requirements.hpp \ -@ENABLE_TOOLS_TRUE@ tools/signals.cpp \ -@ENABLE_TOOLS_TRUE@ tools/signals.hpp \ -@ENABLE_TOOLS_TRUE@ tools/test-program.cpp \ -@ENABLE_TOOLS_TRUE@ tools/test-program.hpp \ -@ENABLE_TOOLS_TRUE@ tools/test_helpers.hpp \ -@ENABLE_TOOLS_TRUE@ tools/text.cpp \ -@ENABLE_TOOLS_TRUE@ tools/text.hpp \ -@ENABLE_TOOLS_TRUE@ tools/timers.cpp \ -@ENABLE_TOOLS_TRUE@ tools/timers.hpp \ -@ENABLE_TOOLS_TRUE@ tools/ui.cpp \ -@ENABLE_TOOLS_TRUE@ tools/ui.hpp \ -@ENABLE_TOOLS_TRUE@ tools/user.cpp \ -@ENABLE_TOOLS_TRUE@ tools/user.hpp - -@ENABLE_TOOLS_TRUE@nodist_tools_libtools_a_SOURCES = tools/defs.hpp -@ENABLE_TOOLS_TRUE@tools_libtools_a_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_CONFDIR=\"$(atf_confdir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_INCLUDEDIR=\"$(includedir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_LIBDIR=\"$(libdir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_MACHINE=\"$(atf_machine)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_SHELL=\"$(ATF_SHELL)\"" \ -@ENABLE_TOOLS_TRUE@ "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \ -@ENABLE_TOOLS_TRUE@ $(TOOLS_CPPFLAGS) - -@ENABLE_TOOLS_TRUE@tools_atf_config_SOURCES = tools/atf-config.cpp -@ENABLE_TOOLS_TRUE@tools_atf_config_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_atf_config_LDADD = $(TOOLS_LDADD) -@ENABLE_TOOLS_TRUE@tools_atf_report_SOURCES = tools/atf-report.cpp -@ENABLE_TOOLS_TRUE@tools_atf_report_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_atf_report_LDADD = $(TOOLS_LDADD) -@ENABLE_TOOLS_TRUE@tools_atf_run_CPPFLAGS = $(TOOLS_CPPFLAGS) "-DGDB=\"$(GDB)\"" -@ENABLE_TOOLS_TRUE@tools_atf_run_SOURCES = tools/atf-run.cpp -@ENABLE_TOOLS_TRUE@tools_atf_run_LDADD = $(TOOLS_LDADD) -@ENABLE_TOOLS_TRUE@tools_atf_version_SOURCES = tools/atf-version.cpp -@ENABLE_TOOLS_TRUE@nodist_tools_atf_version_SOURCES = tools/revision.h -@ENABLE_TOOLS_TRUE@tools_atf_version_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_atf_version_LDADD = $(TOOLS_LDADD) -@ENABLE_TOOLS_TRUE@cssdir = $(atf_cssdir) -@ENABLE_TOOLS_TRUE@css_DATA = tools/tests-results.css -@ENABLE_TOOLS_TRUE@dtddir = $(atf_dtddir) -@ENABLE_TOOLS_TRUE@dtd_DATA = tools/tests-results.dtd -@ENABLE_TOOLS_TRUE@egdir = $(atf_egdir) -@ENABLE_TOOLS_TRUE@eg_DATA = tools/sample/atf-run.hooks \ -@ENABLE_TOOLS_TRUE@ tools/sample/common.conf -@ENABLE_TOOLS_TRUE@hooksdir = $(pkgdatadir) -@ENABLE_TOOLS_TRUE@hooks_DATA = tools/share/atf-run.hooks -@ENABLE_TOOLS_TRUE@xsldir = $(atf_xsldir) -@ENABLE_TOOLS_TRUE@xsl_DATA = tools/tests-results.xsl -@ENABLE_TOOLS_TRUE@tests_tools_DATA = tools/Atffile tools/Kyuafile -@ENABLE_TOOLS_TRUE@tests_toolsdir = $(pkgtestsdir)/tools -@ENABLE_TOOLS_TRUE@tests_tools_SCRIPTS = tools/atf-config_test \ -@ENABLE_TOOLS_TRUE@ tools/atf-report_test tools/atf-run_test -@ENABLE_TOOLS_TRUE@tools_application_test_SOURCES = tools/application_test.cpp -@ENABLE_TOOLS_TRUE@tools_application_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_application_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_atffile_test_SOURCES = tools/atffile_test.cpp -@ENABLE_TOOLS_TRUE@tools_atffile_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_atffile_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_auto_array_test_SOURCES = tools/auto_array_test.cpp -@ENABLE_TOOLS_TRUE@tools_auto_array_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_auto_array_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_SOURCES = tools/bad_metadata_helper.c -@ENABLE_TOOLS_TRUE@tools_bad_metadata_helper_LDADD = libatf-c.la -@ENABLE_TOOLS_TRUE@tools_config_test_SOURCES = tools/config_test.cpp -@ENABLE_TOOLS_TRUE@tools_config_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_config_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_config_file_test_SOURCES = tools/config_file_test.cpp -@ENABLE_TOOLS_TRUE@tools_config_file_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_config_file_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_env_test_SOURCES = tools/env_test.cpp -@ENABLE_TOOLS_TRUE@tools_env_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_env_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_expand_test_SOURCES = tools/expand_test.cpp -@ENABLE_TOOLS_TRUE@tools_expand_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_expand_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_expect_helpers_SOURCES = tools/expect_helpers.c -@ENABLE_TOOLS_TRUE@tools_expect_helpers_LDADD = libatf-c.la -@ENABLE_TOOLS_TRUE@tools_fail_helper_SOURCES = tools/fail_helper.cpp -@ENABLE_TOOLS_TRUE@tools_fail_helper_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_fs_test_SOURCES = tools/fs_test.cpp -@ENABLE_TOOLS_TRUE@tools_fs_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_fs_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_io_test_SOURCES = tools/io_test.cpp -@ENABLE_TOOLS_TRUE@tools_io_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_io_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_misc_helpers_SOURCES = tools/misc_helpers.cpp -@ENABLE_TOOLS_TRUE@tools_misc_helpers_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_misc_helpers_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_parser_test_SOURCES = tools/parser_test.cpp -@ENABLE_TOOLS_TRUE@tools_parser_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_parser_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_process_test_SOURCES = tools/process_test.cpp -@ENABLE_TOOLS_TRUE@tools_process_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_process_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_pass_helper_SOURCES = tools/pass_helper.cpp -@ENABLE_TOOLS_TRUE@tools_pass_helper_LDADD = $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_process_helpers_SOURCES = tools/process_helpers.c -@ENABLE_TOOLS_TRUE@tools_reader_test_SOURCES = tools/reader_test.cpp -@ENABLE_TOOLS_TRUE@tools_reader_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_reader_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_requirements_test_SOURCES = tools/requirements_test.cpp -@ENABLE_TOOLS_TRUE@tools_requirements_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_requirements_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_several_tcs_helper_SOURCES = tools/several_tcs_helper.c -@ENABLE_TOOLS_TRUE@tools_several_tcs_helper_LDADD = libatf-c.la -@ENABLE_TOOLS_TRUE@tools_signals_test_SOURCES = tools/signals_test.cpp tools/signals.cpp -@ENABLE_TOOLS_TRUE@tools_signals_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_signals_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_test_program_test_SOURCES = tools/test_program_test.cpp -@ENABLE_TOOLS_TRUE@tools_test_program_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_test_program_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_text_test_SOURCES = tools/text_test.cpp tools/text.cpp -@ENABLE_TOOLS_TRUE@tools_text_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_text_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_ui_test_SOURCES = tools/ui_test.cpp tools/ui.cpp -@ENABLE_TOOLS_TRUE@tools_ui_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_ui_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_user_test_SOURCES = tools/user_test.cpp tools/user.cpp -@ENABLE_TOOLS_TRUE@tools_user_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -@ENABLE_TOOLS_TRUE@tools_user_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) -@ENABLE_TOOLS_TRUE@tools_zero_tcs_helper_SOURCES = tools/zero_tcs_helper.c -@ENABLE_TOOLS_TRUE@tools_zero_tcs_helper_LDADD = libatf-c.la # # Top-level distfile documents. @@ -1896,7 +1322,7 @@ TESTS_ENVIRONMENT = PATH=$(prefix)/bin:$${PATH} \ testsdir = $(exec_prefix)/tests pkgtestsdir = $(testsdir)/$(PACKAGE) -pkgtests_DATA = Kyuafile $(am__append_11) +pkgtests_DATA = Kyuafile BUILD_SH_TP = \ echo "Creating $${dst}"; \ echo "\#! $(bindir)/atf-sh" >$${dst}; \ @@ -1910,7 +1336,7 @@ all: $(BUILT_SOURCES) bconfig.h .SUFFIXES: .c .cpp .lo .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/tools/Makefile.am.inc $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1933,7 +1359,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/tools/Makefile.am.inc: +$(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1960,60 +1386,6 @@ distclean-hdr: -rm -f bconfig.h stamp-h1 atf-c/defs.h: $(top_builddir)/config.status $(top_srcdir)/atf-c/defs.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ -tools/defs.hpp: $(top_builddir)/config.status $(top_srcdir)/tools/defs.hpp.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -tools/$(am__dirstamp): - @$(MKDIR_P) tools - @: > tools/$(am__dirstamp) -tools/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) tools/$(DEPDIR) - @: > tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-application.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-atffile.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-config.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-config_file.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-env.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-exceptions.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-expand.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-fs.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-io.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-parser.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-process.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-reader.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-requirements.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-signals.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-test-program.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-text.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-timers.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-ui.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_libtools_a-user.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/libtools.a: $(tools_libtools_a_OBJECTS) $(tools_libtools_a_DEPENDENCIES) $(EXTRA_tools_libtools_a_DEPENDENCIES) tools/$(am__dirstamp) - $(AM_V_at)-rm -f tools/libtools.a - $(AM_V_AR)$(tools_libtools_a_AR) tools/libtools.a $(tools_libtools_a_OBJECTS) $(tools_libtools_a_LIBADD) - $(AM_V_at)$(RANLIB) tools/libtools.a install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -2509,55 +1881,6 @@ clean-tests_test_programsPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -install-tests_toolsPROGRAMS: $(tests_tools_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(tests_tools_PROGRAMS)'; test -n "$(tests_toolsdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_toolsdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_toolsdir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_toolsdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_toolsdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-tests_toolsPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(tests_tools_PROGRAMS)'; test -n "$(tests_toolsdir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(tests_toolsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(tests_toolsdir)" && rm -f $$files - -clean-tests_toolsPROGRAMS: - @list='$(tests_tools_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list atf-c++/atf_c++_test.$(OBJEXT): atf-c++/$(am__dirstamp) \ atf-c++/$(DEPDIR)/$(am__dirstamp) @@ -2802,18 +2125,6 @@ bootstrap/$(am__dirstamp): bootstrap/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) bootstrap/$(DEPDIR) @: > bootstrap/$(DEPDIR)/$(am__dirstamp) -bootstrap/h_app_empty.$(OBJEXT): bootstrap/$(am__dirstamp) \ - bootstrap/$(DEPDIR)/$(am__dirstamp) - -bootstrap/h_app_empty$(EXEEXT): $(bootstrap_h_app_empty_OBJECTS) $(bootstrap_h_app_empty_DEPENDENCIES) $(EXTRA_bootstrap_h_app_empty_DEPENDENCIES) bootstrap/$(am__dirstamp) - @rm -f bootstrap/h_app_empty$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(bootstrap_h_app_empty_OBJECTS) $(bootstrap_h_app_empty_LDADD) $(LIBS) -bootstrap/h_app_opts_args.$(OBJEXT): bootstrap/$(am__dirstamp) \ - bootstrap/$(DEPDIR)/$(am__dirstamp) - -bootstrap/h_app_opts_args$(EXEEXT): $(bootstrap_h_app_opts_args_OBJECTS) $(bootstrap_h_app_opts_args_DEPENDENCIES) $(EXTRA_bootstrap_h_app_opts_args_DEPENDENCIES) bootstrap/$(am__dirstamp) - @rm -f bootstrap/h_app_opts_args$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(bootstrap_h_app_opts_args_OBJECTS) $(bootstrap_h_app_opts_args_LDADD) $(LIBS) bootstrap/h_tp_basic_c.$(OBJEXT): bootstrap/$(am__dirstamp) \ bootstrap/$(DEPDIR)/$(am__dirstamp) @@ -2844,194 +2155,6 @@ test-programs/cpp_helpers.$(OBJEXT): test-programs/$(am__dirstamp) \ test-programs/cpp_helpers$(EXEEXT): $(test_programs_cpp_helpers_OBJECTS) $(test_programs_cpp_helpers_DEPENDENCIES) $(EXTRA_test_programs_cpp_helpers_DEPENDENCIES) test-programs/$(am__dirstamp) @rm -f test-programs/cpp_helpers$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(test_programs_cpp_helpers_OBJECTS) $(test_programs_cpp_helpers_LDADD) $(LIBS) -tools/tools_application_test-application_test.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) - -tools/application_test$(EXEEXT): $(tools_application_test_OBJECTS) $(tools_application_test_DEPENDENCIES) $(EXTRA_tools_application_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/application_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_application_test_OBJECTS) $(tools_application_test_LDADD) $(LIBS) -tools/tools_atf_config-atf-config.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/atf-config$(EXEEXT): $(tools_atf_config_OBJECTS) $(tools_atf_config_DEPENDENCIES) $(EXTRA_tools_atf_config_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/atf-config$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_atf_config_OBJECTS) $(tools_atf_config_LDADD) $(LIBS) -tools/tools_atf_report-atf-report.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/atf-report$(EXEEXT): $(tools_atf_report_OBJECTS) $(tools_atf_report_DEPENDENCIES) $(EXTRA_tools_atf_report_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/atf-report$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_atf_report_OBJECTS) $(tools_atf_report_LDADD) $(LIBS) -tools/tools_atf_run-atf-run.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/atf-run$(EXEEXT): $(tools_atf_run_OBJECTS) $(tools_atf_run_DEPENDENCIES) $(EXTRA_tools_atf_run_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/atf-run$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_atf_run_OBJECTS) $(tools_atf_run_LDADD) $(LIBS) -tools/tools_atf_version-atf-version.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/atf-version$(EXEEXT): $(tools_atf_version_OBJECTS) $(tools_atf_version_DEPENDENCIES) $(EXTRA_tools_atf_version_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/atf-version$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_atf_version_OBJECTS) $(tools_atf_version_LDADD) $(LIBS) -tools/tools_atffile_test-atffile_test.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) - -tools/atffile_test$(EXEEXT): $(tools_atffile_test_OBJECTS) $(tools_atffile_test_DEPENDENCIES) $(EXTRA_tools_atffile_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/atffile_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_atffile_test_OBJECTS) $(tools_atffile_test_LDADD) $(LIBS) -tools/tools_auto_array_test-auto_array_test.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) - -tools/auto_array_test$(EXEEXT): $(tools_auto_array_test_OBJECTS) $(tools_auto_array_test_DEPENDENCIES) $(EXTRA_tools_auto_array_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/auto_array_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_auto_array_test_OBJECTS) $(tools_auto_array_test_LDADD) $(LIBS) -tools/bad_metadata_helper.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/bad_metadata_helper$(EXEEXT): $(tools_bad_metadata_helper_OBJECTS) $(tools_bad_metadata_helper_DEPENDENCIES) $(EXTRA_tools_bad_metadata_helper_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/bad_metadata_helper$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tools_bad_metadata_helper_OBJECTS) $(tools_bad_metadata_helper_LDADD) $(LIBS) -tools/tools_config_file_test-config_file_test.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) - -tools/config_file_test$(EXEEXT): $(tools_config_file_test_OBJECTS) $(tools_config_file_test_DEPENDENCIES) $(EXTRA_tools_config_file_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/config_file_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_config_file_test_OBJECTS) $(tools_config_file_test_LDADD) $(LIBS) -tools/tools_config_test-config_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/config_test$(EXEEXT): $(tools_config_test_OBJECTS) $(tools_config_test_DEPENDENCIES) $(EXTRA_tools_config_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/config_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_config_test_OBJECTS) $(tools_config_test_LDADD) $(LIBS) -tools/tools_env_test-env_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/env_test$(EXEEXT): $(tools_env_test_OBJECTS) $(tools_env_test_DEPENDENCIES) $(EXTRA_tools_env_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/env_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_env_test_OBJECTS) $(tools_env_test_LDADD) $(LIBS) -tools/tools_expand_test-expand_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/expand_test$(EXEEXT): $(tools_expand_test_OBJECTS) $(tools_expand_test_DEPENDENCIES) $(EXTRA_tools_expand_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/expand_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_expand_test_OBJECTS) $(tools_expand_test_LDADD) $(LIBS) -tools/expect_helpers.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/expect_helpers$(EXEEXT): $(tools_expect_helpers_OBJECTS) $(tools_expect_helpers_DEPENDENCIES) $(EXTRA_tools_expect_helpers_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/expect_helpers$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tools_expect_helpers_OBJECTS) $(tools_expect_helpers_LDADD) $(LIBS) -tools/fail_helper.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/fail_helper$(EXEEXT): $(tools_fail_helper_OBJECTS) $(tools_fail_helper_DEPENDENCIES) $(EXTRA_tools_fail_helper_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/fail_helper$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_fail_helper_OBJECTS) $(tools_fail_helper_LDADD) $(LIBS) -tools/tools_fs_test-fs_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/fs_test$(EXEEXT): $(tools_fs_test_OBJECTS) $(tools_fs_test_DEPENDENCIES) $(EXTRA_tools_fs_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/fs_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_fs_test_OBJECTS) $(tools_fs_test_LDADD) $(LIBS) -tools/tools_io_test-io_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/io_test$(EXEEXT): $(tools_io_test_OBJECTS) $(tools_io_test_DEPENDENCIES) $(EXTRA_tools_io_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/io_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_io_test_OBJECTS) $(tools_io_test_LDADD) $(LIBS) -tools/tools_misc_helpers-misc_helpers.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) - -tools/misc_helpers$(EXEEXT): $(tools_misc_helpers_OBJECTS) $(tools_misc_helpers_DEPENDENCIES) $(EXTRA_tools_misc_helpers_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/misc_helpers$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_misc_helpers_OBJECTS) $(tools_misc_helpers_LDADD) $(LIBS) -tools/tools_parser_test-parser_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/parser_test$(EXEEXT): $(tools_parser_test_OBJECTS) $(tools_parser_test_DEPENDENCIES) $(EXTRA_tools_parser_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/parser_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_parser_test_OBJECTS) $(tools_parser_test_LDADD) $(LIBS) -tools/pass_helper.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/pass_helper$(EXEEXT): $(tools_pass_helper_OBJECTS) $(tools_pass_helper_DEPENDENCIES) $(EXTRA_tools_pass_helper_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/pass_helper$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_pass_helper_OBJECTS) $(tools_pass_helper_LDADD) $(LIBS) -tools/process_helpers.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/process_helpers$(EXEEXT): $(tools_process_helpers_OBJECTS) $(tools_process_helpers_DEPENDENCIES) $(EXTRA_tools_process_helpers_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/process_helpers$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tools_process_helpers_OBJECTS) $(tools_process_helpers_LDADD) $(LIBS) -tools/tools_process_test-process_test.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) - -tools/process_test$(EXEEXT): $(tools_process_test_OBJECTS) $(tools_process_test_DEPENDENCIES) $(EXTRA_tools_process_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/process_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_process_test_OBJECTS) $(tools_process_test_LDADD) $(LIBS) -tools/tools_reader_test-reader_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/reader_test$(EXEEXT): $(tools_reader_test_OBJECTS) $(tools_reader_test_DEPENDENCIES) $(EXTRA_tools_reader_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/reader_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_reader_test_OBJECTS) $(tools_reader_test_LDADD) $(LIBS) -tools/tools_requirements_test-requirements_test.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) - -tools/requirements_test$(EXEEXT): $(tools_requirements_test_OBJECTS) $(tools_requirements_test_DEPENDENCIES) $(EXTRA_tools_requirements_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/requirements_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_requirements_test_OBJECTS) $(tools_requirements_test_LDADD) $(LIBS) -tools/several_tcs_helper.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/several_tcs_helper$(EXEEXT): $(tools_several_tcs_helper_OBJECTS) $(tools_several_tcs_helper_DEPENDENCIES) $(EXTRA_tools_several_tcs_helper_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/several_tcs_helper$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tools_several_tcs_helper_OBJECTS) $(tools_several_tcs_helper_LDADD) $(LIBS) -tools/tools_signals_test-signals_test.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_signals_test-signals.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/signals_test$(EXEEXT): $(tools_signals_test_OBJECTS) $(tools_signals_test_DEPENDENCIES) $(EXTRA_tools_signals_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/signals_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_signals_test_OBJECTS) $(tools_signals_test_LDADD) $(LIBS) -tools/tools_test_program_test-test_program_test.$(OBJEXT): \ - tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) - -tools/test_program_test$(EXEEXT): $(tools_test_program_test_OBJECTS) $(tools_test_program_test_DEPENDENCIES) $(EXTRA_tools_test_program_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/test_program_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_test_program_test_OBJECTS) $(tools_test_program_test_LDADD) $(LIBS) -tools/tools_text_test-text_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_text_test-text.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/text_test$(EXEEXT): $(tools_text_test_OBJECTS) $(tools_text_test_DEPENDENCIES) $(EXTRA_tools_text_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/text_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_text_test_OBJECTS) $(tools_text_test_LDADD) $(LIBS) -tools/tools_ui_test-ui_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_ui_test-ui.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/ui_test$(EXEEXT): $(tools_ui_test_OBJECTS) $(tools_ui_test_DEPENDENCIES) $(EXTRA_tools_ui_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/ui_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_ui_test_OBJECTS) $(tools_ui_test_LDADD) $(LIBS) -tools/tools_user_test-user_test.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) -tools/tools_user_test-user.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/user_test$(EXEEXT): $(tools_user_test_OBJECTS) $(tools_user_test_DEPENDENCIES) $(EXTRA_tools_user_test_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/user_test$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tools_user_test_OBJECTS) $(tools_user_test_LDADD) $(LIBS) -tools/zero_tcs_helper.$(OBJEXT): tools/$(am__dirstamp) \ - tools/$(DEPDIR)/$(am__dirstamp) - -tools/zero_tcs_helper$(EXEEXT): $(tools_zero_tcs_helper_OBJECTS) $(tools_zero_tcs_helper_DEPENDENCIES) $(EXTRA_tools_zero_tcs_helper_DEPENDENCIES) tools/$(am__dirstamp) - @rm -f tools/zero_tcs_helper$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tools_zero_tcs_helper_OBJECTS) $(tools_zero_tcs_helper_LDADD) $(LIBS) install-tests_atf_cSCRIPTS: $(tests_atf_c_SCRIPTS) @$(NORMAL_INSTALL) @list='$(tests_atf_c_SCRIPTS)'; test -n "$(tests_atf_cdir)" || list=; \ @@ -3172,41 +2295,6 @@ uninstall-tests_test_programsSCRIPTS: files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ dir='$(DESTDIR)$(tests_test_programsdir)'; $(am__uninstall_files_from_dir) -install-tests_toolsSCRIPTS: $(tests_tools_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(tests_tools_SCRIPTS)'; test -n "$(tests_toolsdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_toolsdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_toolsdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_toolsdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_toolsdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-tests_toolsSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(tests_tools_SCRIPTS)'; test -n "$(tests_toolsdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(tests_toolsdir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -3221,7 +2309,6 @@ mostlyclean-compile: -rm -f atf-sh/*.$(OBJEXT) -rm -f bootstrap/*.$(OBJEXT) -rm -f test-programs/*.$(OBJEXT) - -rm -f tools/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -3294,65 +2381,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/version_helper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-sh/$(DEPDIR)/atf-check.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@atf-sh/$(DEPDIR)/atf-sh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_app_empty.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_app_opts_args.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_tp_basic_c.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_tp_basic_cpp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test-programs/$(DEPDIR)/c_helpers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test-programs/$(DEPDIR)/cpp_helpers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/bad_metadata_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/expect_helpers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/fail_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/pass_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/process_helpers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/several_tcs_helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_application_test-application_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atf_config-atf-config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atf_report-atf-report.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atf_run-atf-run.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atf_version-atf-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_atffile_test-atffile_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_config_file_test-config_file_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_config_test-config_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_env_test-env_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_expand_test-expand_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_fs_test-fs_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_io_test-io_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-application.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-atffile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-config_file.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-env.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-exceptions.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-expand.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-fs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-io.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-parser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-process.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-reader.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-requirements.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-signals.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-test-program.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-text.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-timers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-ui.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_libtools_a-user.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_parser_test-parser_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_process_test-process_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_reader_test-reader_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_requirements_test-requirements_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_signals_test-signals.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_signals_test-signals_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_test_program_test-test_program_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_text_test-text.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_text_test-text_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_ui_test-ui.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_ui_test-ui_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_user_test-user.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/tools_user_test-user_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/zero_tcs_helper.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -3528,650 +2560,6 @@ atf-c/detail/libatf_c_la-user.lo: atf-c/detail/user.c @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -tools/tools_libtools_a-application.o: tools/application.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-application.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-application.Tpo -c -o tools/tools_libtools_a-application.o `test -f 'tools/application.cpp' || echo '$(srcdir)/'`tools/application.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-application.Tpo tools/$(DEPDIR)/tools_libtools_a-application.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/application.cpp' object='tools/tools_libtools_a-application.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-application.o `test -f 'tools/application.cpp' || echo '$(srcdir)/'`tools/application.cpp - -tools/tools_libtools_a-application.obj: tools/application.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-application.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-application.Tpo -c -o tools/tools_libtools_a-application.obj `if test -f 'tools/application.cpp'; then $(CYGPATH_W) 'tools/application.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/application.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-application.Tpo tools/$(DEPDIR)/tools_libtools_a-application.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/application.cpp' object='tools/tools_libtools_a-application.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-application.obj `if test -f 'tools/application.cpp'; then $(CYGPATH_W) 'tools/application.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/application.cpp'; fi` - -tools/tools_libtools_a-atffile.o: tools/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-atffile.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-atffile.Tpo -c -o tools/tools_libtools_a-atffile.o `test -f 'tools/atffile.cpp' || echo '$(srcdir)/'`tools/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-atffile.Tpo tools/$(DEPDIR)/tools_libtools_a-atffile.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atffile.cpp' object='tools/tools_libtools_a-atffile.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-atffile.o `test -f 'tools/atffile.cpp' || echo '$(srcdir)/'`tools/atffile.cpp - -tools/tools_libtools_a-atffile.obj: tools/atffile.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-atffile.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-atffile.Tpo -c -o tools/tools_libtools_a-atffile.obj `if test -f 'tools/atffile.cpp'; then $(CYGPATH_W) 'tools/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atffile.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-atffile.Tpo tools/$(DEPDIR)/tools_libtools_a-atffile.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atffile.cpp' object='tools/tools_libtools_a-atffile.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-atffile.obj `if test -f 'tools/atffile.cpp'; then $(CYGPATH_W) 'tools/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atffile.cpp'; fi` - -tools/tools_libtools_a-config.o: tools/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-config.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-config.Tpo -c -o tools/tools_libtools_a-config.o `test -f 'tools/config.cpp' || echo '$(srcdir)/'`tools/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-config.Tpo tools/$(DEPDIR)/tools_libtools_a-config.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config.cpp' object='tools/tools_libtools_a-config.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-config.o `test -f 'tools/config.cpp' || echo '$(srcdir)/'`tools/config.cpp - -tools/tools_libtools_a-config.obj: tools/config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-config.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-config.Tpo -c -o tools/tools_libtools_a-config.obj `if test -f 'tools/config.cpp'; then $(CYGPATH_W) 'tools/config.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-config.Tpo tools/$(DEPDIR)/tools_libtools_a-config.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config.cpp' object='tools/tools_libtools_a-config.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-config.obj `if test -f 'tools/config.cpp'; then $(CYGPATH_W) 'tools/config.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config.cpp'; fi` - -tools/tools_libtools_a-config_file.o: tools/config_file.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-config_file.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-config_file.Tpo -c -o tools/tools_libtools_a-config_file.o `test -f 'tools/config_file.cpp' || echo '$(srcdir)/'`tools/config_file.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-config_file.Tpo tools/$(DEPDIR)/tools_libtools_a-config_file.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_file.cpp' object='tools/tools_libtools_a-config_file.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-config_file.o `test -f 'tools/config_file.cpp' || echo '$(srcdir)/'`tools/config_file.cpp - -tools/tools_libtools_a-config_file.obj: tools/config_file.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-config_file.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-config_file.Tpo -c -o tools/tools_libtools_a-config_file.obj `if test -f 'tools/config_file.cpp'; then $(CYGPATH_W) 'tools/config_file.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_file.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-config_file.Tpo tools/$(DEPDIR)/tools_libtools_a-config_file.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_file.cpp' object='tools/tools_libtools_a-config_file.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-config_file.obj `if test -f 'tools/config_file.cpp'; then $(CYGPATH_W) 'tools/config_file.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_file.cpp'; fi` - -tools/tools_libtools_a-env.o: tools/env.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-env.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-env.Tpo -c -o tools/tools_libtools_a-env.o `test -f 'tools/env.cpp' || echo '$(srcdir)/'`tools/env.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-env.Tpo tools/$(DEPDIR)/tools_libtools_a-env.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/env.cpp' object='tools/tools_libtools_a-env.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-env.o `test -f 'tools/env.cpp' || echo '$(srcdir)/'`tools/env.cpp - -tools/tools_libtools_a-env.obj: tools/env.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-env.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-env.Tpo -c -o tools/tools_libtools_a-env.obj `if test -f 'tools/env.cpp'; then $(CYGPATH_W) 'tools/env.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/env.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-env.Tpo tools/$(DEPDIR)/tools_libtools_a-env.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/env.cpp' object='tools/tools_libtools_a-env.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-env.obj `if test -f 'tools/env.cpp'; then $(CYGPATH_W) 'tools/env.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/env.cpp'; fi` - -tools/tools_libtools_a-exceptions.o: tools/exceptions.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-exceptions.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-exceptions.Tpo -c -o tools/tools_libtools_a-exceptions.o `test -f 'tools/exceptions.cpp' || echo '$(srcdir)/'`tools/exceptions.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-exceptions.Tpo tools/$(DEPDIR)/tools_libtools_a-exceptions.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/exceptions.cpp' object='tools/tools_libtools_a-exceptions.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-exceptions.o `test -f 'tools/exceptions.cpp' || echo '$(srcdir)/'`tools/exceptions.cpp - -tools/tools_libtools_a-exceptions.obj: tools/exceptions.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-exceptions.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-exceptions.Tpo -c -o tools/tools_libtools_a-exceptions.obj `if test -f 'tools/exceptions.cpp'; then $(CYGPATH_W) 'tools/exceptions.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/exceptions.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-exceptions.Tpo tools/$(DEPDIR)/tools_libtools_a-exceptions.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/exceptions.cpp' object='tools/tools_libtools_a-exceptions.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-exceptions.obj `if test -f 'tools/exceptions.cpp'; then $(CYGPATH_W) 'tools/exceptions.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/exceptions.cpp'; fi` - -tools/tools_libtools_a-expand.o: tools/expand.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-expand.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-expand.Tpo -c -o tools/tools_libtools_a-expand.o `test -f 'tools/expand.cpp' || echo '$(srcdir)/'`tools/expand.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-expand.Tpo tools/$(DEPDIR)/tools_libtools_a-expand.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/expand.cpp' object='tools/tools_libtools_a-expand.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-expand.o `test -f 'tools/expand.cpp' || echo '$(srcdir)/'`tools/expand.cpp - -tools/tools_libtools_a-expand.obj: tools/expand.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-expand.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-expand.Tpo -c -o tools/tools_libtools_a-expand.obj `if test -f 'tools/expand.cpp'; then $(CYGPATH_W) 'tools/expand.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/expand.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-expand.Tpo tools/$(DEPDIR)/tools_libtools_a-expand.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/expand.cpp' object='tools/tools_libtools_a-expand.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-expand.obj `if test -f 'tools/expand.cpp'; then $(CYGPATH_W) 'tools/expand.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/expand.cpp'; fi` - -tools/tools_libtools_a-fs.o: tools/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-fs.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-fs.Tpo -c -o tools/tools_libtools_a-fs.o `test -f 'tools/fs.cpp' || echo '$(srcdir)/'`tools/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-fs.Tpo tools/$(DEPDIR)/tools_libtools_a-fs.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/fs.cpp' object='tools/tools_libtools_a-fs.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-fs.o `test -f 'tools/fs.cpp' || echo '$(srcdir)/'`tools/fs.cpp - -tools/tools_libtools_a-fs.obj: tools/fs.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-fs.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-fs.Tpo -c -o tools/tools_libtools_a-fs.obj `if test -f 'tools/fs.cpp'; then $(CYGPATH_W) 'tools/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/fs.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-fs.Tpo tools/$(DEPDIR)/tools_libtools_a-fs.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/fs.cpp' object='tools/tools_libtools_a-fs.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-fs.obj `if test -f 'tools/fs.cpp'; then $(CYGPATH_W) 'tools/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/fs.cpp'; fi` - -tools/tools_libtools_a-io.o: tools/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-io.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-io.Tpo -c -o tools/tools_libtools_a-io.o `test -f 'tools/io.cpp' || echo '$(srcdir)/'`tools/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-io.Tpo tools/$(DEPDIR)/tools_libtools_a-io.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/io.cpp' object='tools/tools_libtools_a-io.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-io.o `test -f 'tools/io.cpp' || echo '$(srcdir)/'`tools/io.cpp - -tools/tools_libtools_a-io.obj: tools/io.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-io.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-io.Tpo -c -o tools/tools_libtools_a-io.obj `if test -f 'tools/io.cpp'; then $(CYGPATH_W) 'tools/io.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/io.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-io.Tpo tools/$(DEPDIR)/tools_libtools_a-io.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/io.cpp' object='tools/tools_libtools_a-io.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-io.obj `if test -f 'tools/io.cpp'; then $(CYGPATH_W) 'tools/io.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/io.cpp'; fi` - -tools/tools_libtools_a-parser.o: tools/parser.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-parser.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-parser.Tpo -c -o tools/tools_libtools_a-parser.o `test -f 'tools/parser.cpp' || echo '$(srcdir)/'`tools/parser.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-parser.Tpo tools/$(DEPDIR)/tools_libtools_a-parser.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/parser.cpp' object='tools/tools_libtools_a-parser.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-parser.o `test -f 'tools/parser.cpp' || echo '$(srcdir)/'`tools/parser.cpp - -tools/tools_libtools_a-parser.obj: tools/parser.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-parser.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-parser.Tpo -c -o tools/tools_libtools_a-parser.obj `if test -f 'tools/parser.cpp'; then $(CYGPATH_W) 'tools/parser.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/parser.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-parser.Tpo tools/$(DEPDIR)/tools_libtools_a-parser.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/parser.cpp' object='tools/tools_libtools_a-parser.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-parser.obj `if test -f 'tools/parser.cpp'; then $(CYGPATH_W) 'tools/parser.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/parser.cpp'; fi` - -tools/tools_libtools_a-process.o: tools/process.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-process.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-process.Tpo -c -o tools/tools_libtools_a-process.o `test -f 'tools/process.cpp' || echo '$(srcdir)/'`tools/process.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-process.Tpo tools/$(DEPDIR)/tools_libtools_a-process.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/process.cpp' object='tools/tools_libtools_a-process.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-process.o `test -f 'tools/process.cpp' || echo '$(srcdir)/'`tools/process.cpp - -tools/tools_libtools_a-process.obj: tools/process.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-process.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-process.Tpo -c -o tools/tools_libtools_a-process.obj `if test -f 'tools/process.cpp'; then $(CYGPATH_W) 'tools/process.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/process.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-process.Tpo tools/$(DEPDIR)/tools_libtools_a-process.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/process.cpp' object='tools/tools_libtools_a-process.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-process.obj `if test -f 'tools/process.cpp'; then $(CYGPATH_W) 'tools/process.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/process.cpp'; fi` - -tools/tools_libtools_a-reader.o: tools/reader.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-reader.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-reader.Tpo -c -o tools/tools_libtools_a-reader.o `test -f 'tools/reader.cpp' || echo '$(srcdir)/'`tools/reader.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-reader.Tpo tools/$(DEPDIR)/tools_libtools_a-reader.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/reader.cpp' object='tools/tools_libtools_a-reader.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-reader.o `test -f 'tools/reader.cpp' || echo '$(srcdir)/'`tools/reader.cpp - -tools/tools_libtools_a-reader.obj: tools/reader.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-reader.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-reader.Tpo -c -o tools/tools_libtools_a-reader.obj `if test -f 'tools/reader.cpp'; then $(CYGPATH_W) 'tools/reader.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/reader.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-reader.Tpo tools/$(DEPDIR)/tools_libtools_a-reader.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/reader.cpp' object='tools/tools_libtools_a-reader.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-reader.obj `if test -f 'tools/reader.cpp'; then $(CYGPATH_W) 'tools/reader.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/reader.cpp'; fi` - -tools/tools_libtools_a-requirements.o: tools/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-requirements.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-requirements.Tpo -c -o tools/tools_libtools_a-requirements.o `test -f 'tools/requirements.cpp' || echo '$(srcdir)/'`tools/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-requirements.Tpo tools/$(DEPDIR)/tools_libtools_a-requirements.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/requirements.cpp' object='tools/tools_libtools_a-requirements.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-requirements.o `test -f 'tools/requirements.cpp' || echo '$(srcdir)/'`tools/requirements.cpp - -tools/tools_libtools_a-requirements.obj: tools/requirements.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-requirements.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-requirements.Tpo -c -o tools/tools_libtools_a-requirements.obj `if test -f 'tools/requirements.cpp'; then $(CYGPATH_W) 'tools/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/requirements.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-requirements.Tpo tools/$(DEPDIR)/tools_libtools_a-requirements.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/requirements.cpp' object='tools/tools_libtools_a-requirements.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-requirements.obj `if test -f 'tools/requirements.cpp'; then $(CYGPATH_W) 'tools/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/requirements.cpp'; fi` - -tools/tools_libtools_a-signals.o: tools/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-signals.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-signals.Tpo -c -o tools/tools_libtools_a-signals.o `test -f 'tools/signals.cpp' || echo '$(srcdir)/'`tools/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-signals.Tpo tools/$(DEPDIR)/tools_libtools_a-signals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals.cpp' object='tools/tools_libtools_a-signals.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-signals.o `test -f 'tools/signals.cpp' || echo '$(srcdir)/'`tools/signals.cpp - -tools/tools_libtools_a-signals.obj: tools/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-signals.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-signals.Tpo -c -o tools/tools_libtools_a-signals.obj `if test -f 'tools/signals.cpp'; then $(CYGPATH_W) 'tools/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-signals.Tpo tools/$(DEPDIR)/tools_libtools_a-signals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals.cpp' object='tools/tools_libtools_a-signals.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-signals.obj `if test -f 'tools/signals.cpp'; then $(CYGPATH_W) 'tools/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals.cpp'; fi` - -tools/tools_libtools_a-test-program.o: tools/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-test-program.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-test-program.Tpo -c -o tools/tools_libtools_a-test-program.o `test -f 'tools/test-program.cpp' || echo '$(srcdir)/'`tools/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-test-program.Tpo tools/$(DEPDIR)/tools_libtools_a-test-program.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/test-program.cpp' object='tools/tools_libtools_a-test-program.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-test-program.o `test -f 'tools/test-program.cpp' || echo '$(srcdir)/'`tools/test-program.cpp - -tools/tools_libtools_a-test-program.obj: tools/test-program.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-test-program.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-test-program.Tpo -c -o tools/tools_libtools_a-test-program.obj `if test -f 'tools/test-program.cpp'; then $(CYGPATH_W) 'tools/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/test-program.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-test-program.Tpo tools/$(DEPDIR)/tools_libtools_a-test-program.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/test-program.cpp' object='tools/tools_libtools_a-test-program.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-test-program.obj `if test -f 'tools/test-program.cpp'; then $(CYGPATH_W) 'tools/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/test-program.cpp'; fi` - -tools/tools_libtools_a-text.o: tools/text.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-text.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-text.Tpo -c -o tools/tools_libtools_a-text.o `test -f 'tools/text.cpp' || echo '$(srcdir)/'`tools/text.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-text.Tpo tools/$(DEPDIR)/tools_libtools_a-text.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text.cpp' object='tools/tools_libtools_a-text.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-text.o `test -f 'tools/text.cpp' || echo '$(srcdir)/'`tools/text.cpp - -tools/tools_libtools_a-text.obj: tools/text.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-text.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-text.Tpo -c -o tools/tools_libtools_a-text.obj `if test -f 'tools/text.cpp'; then $(CYGPATH_W) 'tools/text.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-text.Tpo tools/$(DEPDIR)/tools_libtools_a-text.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text.cpp' object='tools/tools_libtools_a-text.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-text.obj `if test -f 'tools/text.cpp'; then $(CYGPATH_W) 'tools/text.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text.cpp'; fi` - -tools/tools_libtools_a-timers.o: tools/timers.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-timers.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-timers.Tpo -c -o tools/tools_libtools_a-timers.o `test -f 'tools/timers.cpp' || echo '$(srcdir)/'`tools/timers.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-timers.Tpo tools/$(DEPDIR)/tools_libtools_a-timers.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/timers.cpp' object='tools/tools_libtools_a-timers.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-timers.o `test -f 'tools/timers.cpp' || echo '$(srcdir)/'`tools/timers.cpp - -tools/tools_libtools_a-timers.obj: tools/timers.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-timers.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-timers.Tpo -c -o tools/tools_libtools_a-timers.obj `if test -f 'tools/timers.cpp'; then $(CYGPATH_W) 'tools/timers.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/timers.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-timers.Tpo tools/$(DEPDIR)/tools_libtools_a-timers.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/timers.cpp' object='tools/tools_libtools_a-timers.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-timers.obj `if test -f 'tools/timers.cpp'; then $(CYGPATH_W) 'tools/timers.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/timers.cpp'; fi` - -tools/tools_libtools_a-ui.o: tools/ui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-ui.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-ui.Tpo -c -o tools/tools_libtools_a-ui.o `test -f 'tools/ui.cpp' || echo '$(srcdir)/'`tools/ui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-ui.Tpo tools/$(DEPDIR)/tools_libtools_a-ui.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui.cpp' object='tools/tools_libtools_a-ui.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-ui.o `test -f 'tools/ui.cpp' || echo '$(srcdir)/'`tools/ui.cpp - -tools/tools_libtools_a-ui.obj: tools/ui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-ui.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-ui.Tpo -c -o tools/tools_libtools_a-ui.obj `if test -f 'tools/ui.cpp'; then $(CYGPATH_W) 'tools/ui.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-ui.Tpo tools/$(DEPDIR)/tools_libtools_a-ui.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui.cpp' object='tools/tools_libtools_a-ui.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-ui.obj `if test -f 'tools/ui.cpp'; then $(CYGPATH_W) 'tools/ui.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui.cpp'; fi` - -tools/tools_libtools_a-user.o: tools/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-user.o -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-user.Tpo -c -o tools/tools_libtools_a-user.o `test -f 'tools/user.cpp' || echo '$(srcdir)/'`tools/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-user.Tpo tools/$(DEPDIR)/tools_libtools_a-user.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user.cpp' object='tools/tools_libtools_a-user.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-user.o `test -f 'tools/user.cpp' || echo '$(srcdir)/'`tools/user.cpp - -tools/tools_libtools_a-user.obj: tools/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_libtools_a-user.obj -MD -MP -MF tools/$(DEPDIR)/tools_libtools_a-user.Tpo -c -o tools/tools_libtools_a-user.obj `if test -f 'tools/user.cpp'; then $(CYGPATH_W) 'tools/user.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_libtools_a-user.Tpo tools/$(DEPDIR)/tools_libtools_a-user.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user.cpp' object='tools/tools_libtools_a-user.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_libtools_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_libtools_a-user.obj `if test -f 'tools/user.cpp'; then $(CYGPATH_W) 'tools/user.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user.cpp'; fi` - -tools/tools_application_test-application_test.o: tools/application_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_application_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_application_test-application_test.o -MD -MP -MF tools/$(DEPDIR)/tools_application_test-application_test.Tpo -c -o tools/tools_application_test-application_test.o `test -f 'tools/application_test.cpp' || echo '$(srcdir)/'`tools/application_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_application_test-application_test.Tpo tools/$(DEPDIR)/tools_application_test-application_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/application_test.cpp' object='tools/tools_application_test-application_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_application_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_application_test-application_test.o `test -f 'tools/application_test.cpp' || echo '$(srcdir)/'`tools/application_test.cpp - -tools/tools_application_test-application_test.obj: tools/application_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_application_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_application_test-application_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_application_test-application_test.Tpo -c -o tools/tools_application_test-application_test.obj `if test -f 'tools/application_test.cpp'; then $(CYGPATH_W) 'tools/application_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/application_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_application_test-application_test.Tpo tools/$(DEPDIR)/tools_application_test-application_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/application_test.cpp' object='tools/tools_application_test-application_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_application_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_application_test-application_test.obj `if test -f 'tools/application_test.cpp'; then $(CYGPATH_W) 'tools/application_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/application_test.cpp'; fi` - -tools/tools_atf_config-atf-config.o: tools/atf-config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_config_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_config-atf-config.o -MD -MP -MF tools/$(DEPDIR)/tools_atf_config-atf-config.Tpo -c -o tools/tools_atf_config-atf-config.o `test -f 'tools/atf-config.cpp' || echo '$(srcdir)/'`tools/atf-config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_config-atf-config.Tpo tools/$(DEPDIR)/tools_atf_config-atf-config.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-config.cpp' object='tools/tools_atf_config-atf-config.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_config_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_config-atf-config.o `test -f 'tools/atf-config.cpp' || echo '$(srcdir)/'`tools/atf-config.cpp - -tools/tools_atf_config-atf-config.obj: tools/atf-config.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_config_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_config-atf-config.obj -MD -MP -MF tools/$(DEPDIR)/tools_atf_config-atf-config.Tpo -c -o tools/tools_atf_config-atf-config.obj `if test -f 'tools/atf-config.cpp'; then $(CYGPATH_W) 'tools/atf-config.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-config.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_config-atf-config.Tpo tools/$(DEPDIR)/tools_atf_config-atf-config.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-config.cpp' object='tools/tools_atf_config-atf-config.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_config_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_config-atf-config.obj `if test -f 'tools/atf-config.cpp'; then $(CYGPATH_W) 'tools/atf-config.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-config.cpp'; fi` - -tools/tools_atf_report-atf-report.o: tools/atf-report.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_report_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_report-atf-report.o -MD -MP -MF tools/$(DEPDIR)/tools_atf_report-atf-report.Tpo -c -o tools/tools_atf_report-atf-report.o `test -f 'tools/atf-report.cpp' || echo '$(srcdir)/'`tools/atf-report.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_report-atf-report.Tpo tools/$(DEPDIR)/tools_atf_report-atf-report.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-report.cpp' object='tools/tools_atf_report-atf-report.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_report_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_report-atf-report.o `test -f 'tools/atf-report.cpp' || echo '$(srcdir)/'`tools/atf-report.cpp - -tools/tools_atf_report-atf-report.obj: tools/atf-report.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_report_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_report-atf-report.obj -MD -MP -MF tools/$(DEPDIR)/tools_atf_report-atf-report.Tpo -c -o tools/tools_atf_report-atf-report.obj `if test -f 'tools/atf-report.cpp'; then $(CYGPATH_W) 'tools/atf-report.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-report.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_report-atf-report.Tpo tools/$(DEPDIR)/tools_atf_report-atf-report.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-report.cpp' object='tools/tools_atf_report-atf-report.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_report_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_report-atf-report.obj `if test -f 'tools/atf-report.cpp'; then $(CYGPATH_W) 'tools/atf-report.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-report.cpp'; fi` - -tools/tools_atf_run-atf-run.o: tools/atf-run.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_run-atf-run.o -MD -MP -MF tools/$(DEPDIR)/tools_atf_run-atf-run.Tpo -c -o tools/tools_atf_run-atf-run.o `test -f 'tools/atf-run.cpp' || echo '$(srcdir)/'`tools/atf-run.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_run-atf-run.Tpo tools/$(DEPDIR)/tools_atf_run-atf-run.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-run.cpp' object='tools/tools_atf_run-atf-run.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_run-atf-run.o `test -f 'tools/atf-run.cpp' || echo '$(srcdir)/'`tools/atf-run.cpp - -tools/tools_atf_run-atf-run.obj: tools/atf-run.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_run-atf-run.obj -MD -MP -MF tools/$(DEPDIR)/tools_atf_run-atf-run.Tpo -c -o tools/tools_atf_run-atf-run.obj `if test -f 'tools/atf-run.cpp'; then $(CYGPATH_W) 'tools/atf-run.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-run.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_run-atf-run.Tpo tools/$(DEPDIR)/tools_atf_run-atf-run.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-run.cpp' object='tools/tools_atf_run-atf-run.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_run-atf-run.obj `if test -f 'tools/atf-run.cpp'; then $(CYGPATH_W) 'tools/atf-run.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-run.cpp'; fi` - -tools/tools_atf_version-atf-version.o: tools/atf-version.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_version-atf-version.o -MD -MP -MF tools/$(DEPDIR)/tools_atf_version-atf-version.Tpo -c -o tools/tools_atf_version-atf-version.o `test -f 'tools/atf-version.cpp' || echo '$(srcdir)/'`tools/atf-version.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_version-atf-version.Tpo tools/$(DEPDIR)/tools_atf_version-atf-version.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-version.cpp' object='tools/tools_atf_version-atf-version.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_version-atf-version.o `test -f 'tools/atf-version.cpp' || echo '$(srcdir)/'`tools/atf-version.cpp - -tools/tools_atf_version-atf-version.obj: tools/atf-version.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atf_version-atf-version.obj -MD -MP -MF tools/$(DEPDIR)/tools_atf_version-atf-version.Tpo -c -o tools/tools_atf_version-atf-version.obj `if test -f 'tools/atf-version.cpp'; then $(CYGPATH_W) 'tools/atf-version.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-version.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atf_version-atf-version.Tpo tools/$(DEPDIR)/tools_atf_version-atf-version.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atf-version.cpp' object='tools/tools_atf_version-atf-version.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atf_version-atf-version.obj `if test -f 'tools/atf-version.cpp'; then $(CYGPATH_W) 'tools/atf-version.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atf-version.cpp'; fi` - -tools/tools_atffile_test-atffile_test.o: tools/atffile_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atffile_test-atffile_test.o -MD -MP -MF tools/$(DEPDIR)/tools_atffile_test-atffile_test.Tpo -c -o tools/tools_atffile_test-atffile_test.o `test -f 'tools/atffile_test.cpp' || echo '$(srcdir)/'`tools/atffile_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atffile_test-atffile_test.Tpo tools/$(DEPDIR)/tools_atffile_test-atffile_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atffile_test.cpp' object='tools/tools_atffile_test-atffile_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atffile_test-atffile_test.o `test -f 'tools/atffile_test.cpp' || echo '$(srcdir)/'`tools/atffile_test.cpp - -tools/tools_atffile_test-atffile_test.obj: tools/atffile_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_atffile_test-atffile_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_atffile_test-atffile_test.Tpo -c -o tools/tools_atffile_test-atffile_test.obj `if test -f 'tools/atffile_test.cpp'; then $(CYGPATH_W) 'tools/atffile_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atffile_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_atffile_test-atffile_test.Tpo tools/$(DEPDIR)/tools_atffile_test-atffile_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/atffile_test.cpp' object='tools/tools_atffile_test-atffile_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_atffile_test-atffile_test.obj `if test -f 'tools/atffile_test.cpp'; then $(CYGPATH_W) 'tools/atffile_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/atffile_test.cpp'; fi` - -tools/tools_auto_array_test-auto_array_test.o: tools/auto_array_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_auto_array_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_auto_array_test-auto_array_test.o -MD -MP -MF tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Tpo -c -o tools/tools_auto_array_test-auto_array_test.o `test -f 'tools/auto_array_test.cpp' || echo '$(srcdir)/'`tools/auto_array_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Tpo tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/auto_array_test.cpp' object='tools/tools_auto_array_test-auto_array_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_auto_array_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_auto_array_test-auto_array_test.o `test -f 'tools/auto_array_test.cpp' || echo '$(srcdir)/'`tools/auto_array_test.cpp - -tools/tools_auto_array_test-auto_array_test.obj: tools/auto_array_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_auto_array_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_auto_array_test-auto_array_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Tpo -c -o tools/tools_auto_array_test-auto_array_test.obj `if test -f 'tools/auto_array_test.cpp'; then $(CYGPATH_W) 'tools/auto_array_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/auto_array_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Tpo tools/$(DEPDIR)/tools_auto_array_test-auto_array_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/auto_array_test.cpp' object='tools/tools_auto_array_test-auto_array_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_auto_array_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_auto_array_test-auto_array_test.obj `if test -f 'tools/auto_array_test.cpp'; then $(CYGPATH_W) 'tools/auto_array_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/auto_array_test.cpp'; fi` - -tools/tools_config_file_test-config_file_test.o: tools/config_file_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_file_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_config_file_test-config_file_test.o -MD -MP -MF tools/$(DEPDIR)/tools_config_file_test-config_file_test.Tpo -c -o tools/tools_config_file_test-config_file_test.o `test -f 'tools/config_file_test.cpp' || echo '$(srcdir)/'`tools/config_file_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_config_file_test-config_file_test.Tpo tools/$(DEPDIR)/tools_config_file_test-config_file_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_file_test.cpp' object='tools/tools_config_file_test-config_file_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_file_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_config_file_test-config_file_test.o `test -f 'tools/config_file_test.cpp' || echo '$(srcdir)/'`tools/config_file_test.cpp - -tools/tools_config_file_test-config_file_test.obj: tools/config_file_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_file_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_config_file_test-config_file_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_config_file_test-config_file_test.Tpo -c -o tools/tools_config_file_test-config_file_test.obj `if test -f 'tools/config_file_test.cpp'; then $(CYGPATH_W) 'tools/config_file_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_file_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_config_file_test-config_file_test.Tpo tools/$(DEPDIR)/tools_config_file_test-config_file_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_file_test.cpp' object='tools/tools_config_file_test-config_file_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_file_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_config_file_test-config_file_test.obj `if test -f 'tools/config_file_test.cpp'; then $(CYGPATH_W) 'tools/config_file_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_file_test.cpp'; fi` - -tools/tools_config_test-config_test.o: tools/config_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_config_test-config_test.o -MD -MP -MF tools/$(DEPDIR)/tools_config_test-config_test.Tpo -c -o tools/tools_config_test-config_test.o `test -f 'tools/config_test.cpp' || echo '$(srcdir)/'`tools/config_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_config_test-config_test.Tpo tools/$(DEPDIR)/tools_config_test-config_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_test.cpp' object='tools/tools_config_test-config_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_config_test-config_test.o `test -f 'tools/config_test.cpp' || echo '$(srcdir)/'`tools/config_test.cpp - -tools/tools_config_test-config_test.obj: tools/config_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_config_test-config_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_config_test-config_test.Tpo -c -o tools/tools_config_test-config_test.obj `if test -f 'tools/config_test.cpp'; then $(CYGPATH_W) 'tools/config_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_config_test-config_test.Tpo tools/$(DEPDIR)/tools_config_test-config_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/config_test.cpp' object='tools/tools_config_test-config_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_config_test-config_test.obj `if test -f 'tools/config_test.cpp'; then $(CYGPATH_W) 'tools/config_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/config_test.cpp'; fi` - -tools/tools_env_test-env_test.o: tools/env_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_env_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_env_test-env_test.o -MD -MP -MF tools/$(DEPDIR)/tools_env_test-env_test.Tpo -c -o tools/tools_env_test-env_test.o `test -f 'tools/env_test.cpp' || echo '$(srcdir)/'`tools/env_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_env_test-env_test.Tpo tools/$(DEPDIR)/tools_env_test-env_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/env_test.cpp' object='tools/tools_env_test-env_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_env_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_env_test-env_test.o `test -f 'tools/env_test.cpp' || echo '$(srcdir)/'`tools/env_test.cpp - -tools/tools_env_test-env_test.obj: tools/env_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_env_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_env_test-env_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_env_test-env_test.Tpo -c -o tools/tools_env_test-env_test.obj `if test -f 'tools/env_test.cpp'; then $(CYGPATH_W) 'tools/env_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/env_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_env_test-env_test.Tpo tools/$(DEPDIR)/tools_env_test-env_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/env_test.cpp' object='tools/tools_env_test-env_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_env_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_env_test-env_test.obj `if test -f 'tools/env_test.cpp'; then $(CYGPATH_W) 'tools/env_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/env_test.cpp'; fi` - -tools/tools_expand_test-expand_test.o: tools/expand_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_expand_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_expand_test-expand_test.o -MD -MP -MF tools/$(DEPDIR)/tools_expand_test-expand_test.Tpo -c -o tools/tools_expand_test-expand_test.o `test -f 'tools/expand_test.cpp' || echo '$(srcdir)/'`tools/expand_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_expand_test-expand_test.Tpo tools/$(DEPDIR)/tools_expand_test-expand_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/expand_test.cpp' object='tools/tools_expand_test-expand_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_expand_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_expand_test-expand_test.o `test -f 'tools/expand_test.cpp' || echo '$(srcdir)/'`tools/expand_test.cpp - -tools/tools_expand_test-expand_test.obj: tools/expand_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_expand_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_expand_test-expand_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_expand_test-expand_test.Tpo -c -o tools/tools_expand_test-expand_test.obj `if test -f 'tools/expand_test.cpp'; then $(CYGPATH_W) 'tools/expand_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/expand_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_expand_test-expand_test.Tpo tools/$(DEPDIR)/tools_expand_test-expand_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/expand_test.cpp' object='tools/tools_expand_test-expand_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_expand_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_expand_test-expand_test.obj `if test -f 'tools/expand_test.cpp'; then $(CYGPATH_W) 'tools/expand_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/expand_test.cpp'; fi` - -tools/tools_fs_test-fs_test.o: tools/fs_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_fs_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_fs_test-fs_test.o -MD -MP -MF tools/$(DEPDIR)/tools_fs_test-fs_test.Tpo -c -o tools/tools_fs_test-fs_test.o `test -f 'tools/fs_test.cpp' || echo '$(srcdir)/'`tools/fs_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_fs_test-fs_test.Tpo tools/$(DEPDIR)/tools_fs_test-fs_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/fs_test.cpp' object='tools/tools_fs_test-fs_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_fs_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_fs_test-fs_test.o `test -f 'tools/fs_test.cpp' || echo '$(srcdir)/'`tools/fs_test.cpp - -tools/tools_fs_test-fs_test.obj: tools/fs_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_fs_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_fs_test-fs_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_fs_test-fs_test.Tpo -c -o tools/tools_fs_test-fs_test.obj `if test -f 'tools/fs_test.cpp'; then $(CYGPATH_W) 'tools/fs_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/fs_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_fs_test-fs_test.Tpo tools/$(DEPDIR)/tools_fs_test-fs_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/fs_test.cpp' object='tools/tools_fs_test-fs_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_fs_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_fs_test-fs_test.obj `if test -f 'tools/fs_test.cpp'; then $(CYGPATH_W) 'tools/fs_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/fs_test.cpp'; fi` - -tools/tools_io_test-io_test.o: tools/io_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_io_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_io_test-io_test.o -MD -MP -MF tools/$(DEPDIR)/tools_io_test-io_test.Tpo -c -o tools/tools_io_test-io_test.o `test -f 'tools/io_test.cpp' || echo '$(srcdir)/'`tools/io_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_io_test-io_test.Tpo tools/$(DEPDIR)/tools_io_test-io_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/io_test.cpp' object='tools/tools_io_test-io_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_io_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_io_test-io_test.o `test -f 'tools/io_test.cpp' || echo '$(srcdir)/'`tools/io_test.cpp - -tools/tools_io_test-io_test.obj: tools/io_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_io_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_io_test-io_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_io_test-io_test.Tpo -c -o tools/tools_io_test-io_test.obj `if test -f 'tools/io_test.cpp'; then $(CYGPATH_W) 'tools/io_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/io_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_io_test-io_test.Tpo tools/$(DEPDIR)/tools_io_test-io_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/io_test.cpp' object='tools/tools_io_test-io_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_io_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_io_test-io_test.obj `if test -f 'tools/io_test.cpp'; then $(CYGPATH_W) 'tools/io_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/io_test.cpp'; fi` - -tools/tools_misc_helpers-misc_helpers.o: tools/misc_helpers.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_misc_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_misc_helpers-misc_helpers.o -MD -MP -MF tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Tpo -c -o tools/tools_misc_helpers-misc_helpers.o `test -f 'tools/misc_helpers.cpp' || echo '$(srcdir)/'`tools/misc_helpers.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Tpo tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/misc_helpers.cpp' object='tools/tools_misc_helpers-misc_helpers.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_misc_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_misc_helpers-misc_helpers.o `test -f 'tools/misc_helpers.cpp' || echo '$(srcdir)/'`tools/misc_helpers.cpp - -tools/tools_misc_helpers-misc_helpers.obj: tools/misc_helpers.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_misc_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_misc_helpers-misc_helpers.obj -MD -MP -MF tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Tpo -c -o tools/tools_misc_helpers-misc_helpers.obj `if test -f 'tools/misc_helpers.cpp'; then $(CYGPATH_W) 'tools/misc_helpers.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/misc_helpers.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Tpo tools/$(DEPDIR)/tools_misc_helpers-misc_helpers.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/misc_helpers.cpp' object='tools/tools_misc_helpers-misc_helpers.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_misc_helpers_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_misc_helpers-misc_helpers.obj `if test -f 'tools/misc_helpers.cpp'; then $(CYGPATH_W) 'tools/misc_helpers.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/misc_helpers.cpp'; fi` - -tools/tools_parser_test-parser_test.o: tools/parser_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_parser_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_parser_test-parser_test.o -MD -MP -MF tools/$(DEPDIR)/tools_parser_test-parser_test.Tpo -c -o tools/tools_parser_test-parser_test.o `test -f 'tools/parser_test.cpp' || echo '$(srcdir)/'`tools/parser_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_parser_test-parser_test.Tpo tools/$(DEPDIR)/tools_parser_test-parser_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/parser_test.cpp' object='tools/tools_parser_test-parser_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_parser_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_parser_test-parser_test.o `test -f 'tools/parser_test.cpp' || echo '$(srcdir)/'`tools/parser_test.cpp - -tools/tools_parser_test-parser_test.obj: tools/parser_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_parser_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_parser_test-parser_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_parser_test-parser_test.Tpo -c -o tools/tools_parser_test-parser_test.obj `if test -f 'tools/parser_test.cpp'; then $(CYGPATH_W) 'tools/parser_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/parser_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_parser_test-parser_test.Tpo tools/$(DEPDIR)/tools_parser_test-parser_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/parser_test.cpp' object='tools/tools_parser_test-parser_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_parser_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_parser_test-parser_test.obj `if test -f 'tools/parser_test.cpp'; then $(CYGPATH_W) 'tools/parser_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/parser_test.cpp'; fi` - -tools/tools_process_test-process_test.o: tools/process_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_process_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_process_test-process_test.o -MD -MP -MF tools/$(DEPDIR)/tools_process_test-process_test.Tpo -c -o tools/tools_process_test-process_test.o `test -f 'tools/process_test.cpp' || echo '$(srcdir)/'`tools/process_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_process_test-process_test.Tpo tools/$(DEPDIR)/tools_process_test-process_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/process_test.cpp' object='tools/tools_process_test-process_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_process_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_process_test-process_test.o `test -f 'tools/process_test.cpp' || echo '$(srcdir)/'`tools/process_test.cpp - -tools/tools_process_test-process_test.obj: tools/process_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_process_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_process_test-process_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_process_test-process_test.Tpo -c -o tools/tools_process_test-process_test.obj `if test -f 'tools/process_test.cpp'; then $(CYGPATH_W) 'tools/process_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/process_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_process_test-process_test.Tpo tools/$(DEPDIR)/tools_process_test-process_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/process_test.cpp' object='tools/tools_process_test-process_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_process_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_process_test-process_test.obj `if test -f 'tools/process_test.cpp'; then $(CYGPATH_W) 'tools/process_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/process_test.cpp'; fi` - -tools/tools_reader_test-reader_test.o: tools/reader_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_reader_test-reader_test.o -MD -MP -MF tools/$(DEPDIR)/tools_reader_test-reader_test.Tpo -c -o tools/tools_reader_test-reader_test.o `test -f 'tools/reader_test.cpp' || echo '$(srcdir)/'`tools/reader_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_reader_test-reader_test.Tpo tools/$(DEPDIR)/tools_reader_test-reader_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/reader_test.cpp' object='tools/tools_reader_test-reader_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_reader_test-reader_test.o `test -f 'tools/reader_test.cpp' || echo '$(srcdir)/'`tools/reader_test.cpp - -tools/tools_reader_test-reader_test.obj: tools/reader_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_reader_test-reader_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_reader_test-reader_test.Tpo -c -o tools/tools_reader_test-reader_test.obj `if test -f 'tools/reader_test.cpp'; then $(CYGPATH_W) 'tools/reader_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/reader_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_reader_test-reader_test.Tpo tools/$(DEPDIR)/tools_reader_test-reader_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/reader_test.cpp' object='tools/tools_reader_test-reader_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_reader_test-reader_test.obj `if test -f 'tools/reader_test.cpp'; then $(CYGPATH_W) 'tools/reader_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/reader_test.cpp'; fi` - -tools/tools_requirements_test-requirements_test.o: tools/requirements_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_requirements_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_requirements_test-requirements_test.o -MD -MP -MF tools/$(DEPDIR)/tools_requirements_test-requirements_test.Tpo -c -o tools/tools_requirements_test-requirements_test.o `test -f 'tools/requirements_test.cpp' || echo '$(srcdir)/'`tools/requirements_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_requirements_test-requirements_test.Tpo tools/$(DEPDIR)/tools_requirements_test-requirements_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/requirements_test.cpp' object='tools/tools_requirements_test-requirements_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_requirements_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_requirements_test-requirements_test.o `test -f 'tools/requirements_test.cpp' || echo '$(srcdir)/'`tools/requirements_test.cpp - -tools/tools_requirements_test-requirements_test.obj: tools/requirements_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_requirements_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_requirements_test-requirements_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_requirements_test-requirements_test.Tpo -c -o tools/tools_requirements_test-requirements_test.obj `if test -f 'tools/requirements_test.cpp'; then $(CYGPATH_W) 'tools/requirements_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/requirements_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_requirements_test-requirements_test.Tpo tools/$(DEPDIR)/tools_requirements_test-requirements_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/requirements_test.cpp' object='tools/tools_requirements_test-requirements_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_requirements_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_requirements_test-requirements_test.obj `if test -f 'tools/requirements_test.cpp'; then $(CYGPATH_W) 'tools/requirements_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/requirements_test.cpp'; fi` - -tools/tools_signals_test-signals_test.o: tools/signals_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_signals_test-signals_test.o -MD -MP -MF tools/$(DEPDIR)/tools_signals_test-signals_test.Tpo -c -o tools/tools_signals_test-signals_test.o `test -f 'tools/signals_test.cpp' || echo '$(srcdir)/'`tools/signals_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_signals_test-signals_test.Tpo tools/$(DEPDIR)/tools_signals_test-signals_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals_test.cpp' object='tools/tools_signals_test-signals_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_signals_test-signals_test.o `test -f 'tools/signals_test.cpp' || echo '$(srcdir)/'`tools/signals_test.cpp - -tools/tools_signals_test-signals_test.obj: tools/signals_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_signals_test-signals_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_signals_test-signals_test.Tpo -c -o tools/tools_signals_test-signals_test.obj `if test -f 'tools/signals_test.cpp'; then $(CYGPATH_W) 'tools/signals_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_signals_test-signals_test.Tpo tools/$(DEPDIR)/tools_signals_test-signals_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals_test.cpp' object='tools/tools_signals_test-signals_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_signals_test-signals_test.obj `if test -f 'tools/signals_test.cpp'; then $(CYGPATH_W) 'tools/signals_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals_test.cpp'; fi` - -tools/tools_signals_test-signals.o: tools/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_signals_test-signals.o -MD -MP -MF tools/$(DEPDIR)/tools_signals_test-signals.Tpo -c -o tools/tools_signals_test-signals.o `test -f 'tools/signals.cpp' || echo '$(srcdir)/'`tools/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_signals_test-signals.Tpo tools/$(DEPDIR)/tools_signals_test-signals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals.cpp' object='tools/tools_signals_test-signals.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_signals_test-signals.o `test -f 'tools/signals.cpp' || echo '$(srcdir)/'`tools/signals.cpp - -tools/tools_signals_test-signals.obj: tools/signals.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_signals_test-signals.obj -MD -MP -MF tools/$(DEPDIR)/tools_signals_test-signals.Tpo -c -o tools/tools_signals_test-signals.obj `if test -f 'tools/signals.cpp'; then $(CYGPATH_W) 'tools/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_signals_test-signals.Tpo tools/$(DEPDIR)/tools_signals_test-signals.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/signals.cpp' object='tools/tools_signals_test-signals.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_signals_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_signals_test-signals.obj `if test -f 'tools/signals.cpp'; then $(CYGPATH_W) 'tools/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/signals.cpp'; fi` - -tools/tools_test_program_test-test_program_test.o: tools/test_program_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_test_program_test-test_program_test.o -MD -MP -MF tools/$(DEPDIR)/tools_test_program_test-test_program_test.Tpo -c -o tools/tools_test_program_test-test_program_test.o `test -f 'tools/test_program_test.cpp' || echo '$(srcdir)/'`tools/test_program_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_test_program_test-test_program_test.Tpo tools/$(DEPDIR)/tools_test_program_test-test_program_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/test_program_test.cpp' object='tools/tools_test_program_test-test_program_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_test_program_test-test_program_test.o `test -f 'tools/test_program_test.cpp' || echo '$(srcdir)/'`tools/test_program_test.cpp - -tools/tools_test_program_test-test_program_test.obj: tools/test_program_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_test_program_test-test_program_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_test_program_test-test_program_test.Tpo -c -o tools/tools_test_program_test-test_program_test.obj `if test -f 'tools/test_program_test.cpp'; then $(CYGPATH_W) 'tools/test_program_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/test_program_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_test_program_test-test_program_test.Tpo tools/$(DEPDIR)/tools_test_program_test-test_program_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/test_program_test.cpp' object='tools/tools_test_program_test-test_program_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_test_program_test-test_program_test.obj `if test -f 'tools/test_program_test.cpp'; then $(CYGPATH_W) 'tools/test_program_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/test_program_test.cpp'; fi` - -tools/tools_text_test-text_test.o: tools/text_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_text_test-text_test.o -MD -MP -MF tools/$(DEPDIR)/tools_text_test-text_test.Tpo -c -o tools/tools_text_test-text_test.o `test -f 'tools/text_test.cpp' || echo '$(srcdir)/'`tools/text_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_text_test-text_test.Tpo tools/$(DEPDIR)/tools_text_test-text_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text_test.cpp' object='tools/tools_text_test-text_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_text_test-text_test.o `test -f 'tools/text_test.cpp' || echo '$(srcdir)/'`tools/text_test.cpp - -tools/tools_text_test-text_test.obj: tools/text_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_text_test-text_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_text_test-text_test.Tpo -c -o tools/tools_text_test-text_test.obj `if test -f 'tools/text_test.cpp'; then $(CYGPATH_W) 'tools/text_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_text_test-text_test.Tpo tools/$(DEPDIR)/tools_text_test-text_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text_test.cpp' object='tools/tools_text_test-text_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_text_test-text_test.obj `if test -f 'tools/text_test.cpp'; then $(CYGPATH_W) 'tools/text_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text_test.cpp'; fi` - -tools/tools_text_test-text.o: tools/text.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_text_test-text.o -MD -MP -MF tools/$(DEPDIR)/tools_text_test-text.Tpo -c -o tools/tools_text_test-text.o `test -f 'tools/text.cpp' || echo '$(srcdir)/'`tools/text.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_text_test-text.Tpo tools/$(DEPDIR)/tools_text_test-text.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text.cpp' object='tools/tools_text_test-text.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_text_test-text.o `test -f 'tools/text.cpp' || echo '$(srcdir)/'`tools/text.cpp - -tools/tools_text_test-text.obj: tools/text.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_text_test-text.obj -MD -MP -MF tools/$(DEPDIR)/tools_text_test-text.Tpo -c -o tools/tools_text_test-text.obj `if test -f 'tools/text.cpp'; then $(CYGPATH_W) 'tools/text.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_text_test-text.Tpo tools/$(DEPDIR)/tools_text_test-text.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/text.cpp' object='tools/tools_text_test-text.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_text_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_text_test-text.obj `if test -f 'tools/text.cpp'; then $(CYGPATH_W) 'tools/text.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/text.cpp'; fi` - -tools/tools_ui_test-ui_test.o: tools/ui_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_ui_test-ui_test.o -MD -MP -MF tools/$(DEPDIR)/tools_ui_test-ui_test.Tpo -c -o tools/tools_ui_test-ui_test.o `test -f 'tools/ui_test.cpp' || echo '$(srcdir)/'`tools/ui_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_ui_test-ui_test.Tpo tools/$(DEPDIR)/tools_ui_test-ui_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui_test.cpp' object='tools/tools_ui_test-ui_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_ui_test-ui_test.o `test -f 'tools/ui_test.cpp' || echo '$(srcdir)/'`tools/ui_test.cpp - -tools/tools_ui_test-ui_test.obj: tools/ui_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_ui_test-ui_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_ui_test-ui_test.Tpo -c -o tools/tools_ui_test-ui_test.obj `if test -f 'tools/ui_test.cpp'; then $(CYGPATH_W) 'tools/ui_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_ui_test-ui_test.Tpo tools/$(DEPDIR)/tools_ui_test-ui_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui_test.cpp' object='tools/tools_ui_test-ui_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_ui_test-ui_test.obj `if test -f 'tools/ui_test.cpp'; then $(CYGPATH_W) 'tools/ui_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui_test.cpp'; fi` - -tools/tools_ui_test-ui.o: tools/ui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_ui_test-ui.o -MD -MP -MF tools/$(DEPDIR)/tools_ui_test-ui.Tpo -c -o tools/tools_ui_test-ui.o `test -f 'tools/ui.cpp' || echo '$(srcdir)/'`tools/ui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_ui_test-ui.Tpo tools/$(DEPDIR)/tools_ui_test-ui.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui.cpp' object='tools/tools_ui_test-ui.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_ui_test-ui.o `test -f 'tools/ui.cpp' || echo '$(srcdir)/'`tools/ui.cpp - -tools/tools_ui_test-ui.obj: tools/ui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_ui_test-ui.obj -MD -MP -MF tools/$(DEPDIR)/tools_ui_test-ui.Tpo -c -o tools/tools_ui_test-ui.obj `if test -f 'tools/ui.cpp'; then $(CYGPATH_W) 'tools/ui.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_ui_test-ui.Tpo tools/$(DEPDIR)/tools_ui_test-ui.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/ui.cpp' object='tools/tools_ui_test-ui.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_ui_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_ui_test-ui.obj `if test -f 'tools/ui.cpp'; then $(CYGPATH_W) 'tools/ui.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/ui.cpp'; fi` - -tools/tools_user_test-user_test.o: tools/user_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_user_test-user_test.o -MD -MP -MF tools/$(DEPDIR)/tools_user_test-user_test.Tpo -c -o tools/tools_user_test-user_test.o `test -f 'tools/user_test.cpp' || echo '$(srcdir)/'`tools/user_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_user_test-user_test.Tpo tools/$(DEPDIR)/tools_user_test-user_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user_test.cpp' object='tools/tools_user_test-user_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_user_test-user_test.o `test -f 'tools/user_test.cpp' || echo '$(srcdir)/'`tools/user_test.cpp - -tools/tools_user_test-user_test.obj: tools/user_test.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_user_test-user_test.obj -MD -MP -MF tools/$(DEPDIR)/tools_user_test-user_test.Tpo -c -o tools/tools_user_test-user_test.obj `if test -f 'tools/user_test.cpp'; then $(CYGPATH_W) 'tools/user_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user_test.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_user_test-user_test.Tpo tools/$(DEPDIR)/tools_user_test-user_test.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user_test.cpp' object='tools/tools_user_test-user_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_user_test-user_test.obj `if test -f 'tools/user_test.cpp'; then $(CYGPATH_W) 'tools/user_test.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user_test.cpp'; fi` - -tools/tools_user_test-user.o: tools/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_user_test-user.o -MD -MP -MF tools/$(DEPDIR)/tools_user_test-user.Tpo -c -o tools/tools_user_test-user.o `test -f 'tools/user.cpp' || echo '$(srcdir)/'`tools/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_user_test-user.Tpo tools/$(DEPDIR)/tools_user_test-user.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user.cpp' object='tools/tools_user_test-user.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_user_test-user.o `test -f 'tools/user.cpp' || echo '$(srcdir)/'`tools/user.cpp - -tools/tools_user_test-user.obj: tools/user.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tools/tools_user_test-user.obj -MD -MP -MF tools/$(DEPDIR)/tools_user_test-user.Tpo -c -o tools/tools_user_test-user.obj `if test -f 'tools/user.cpp'; then $(CYGPATH_W) 'tools/user.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tools/$(DEPDIR)/tools_user_test-user.Tpo tools/$(DEPDIR)/tools_user_test-user.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tools/user.cpp' object='tools/tools_user_test-user.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tools_user_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tools/tools_user_test-user.obj `if test -f 'tools/user.cpp'; then $(CYGPATH_W) 'tools/user.cpp'; else $(CYGPATH_W) '$(srcdir)/tools/user.cpp'; fi` - mostlyclean-libtool: -rm -f *.lo @@ -4184,7 +2572,6 @@ clean-libtool: -rm -rf atf-sh/.libs atf-sh/_libs -rm -rf bootstrap/.libs bootstrap/_libs -rm -rf test-programs/.libs test-programs/_libs - -rm -rf tools/.libs tools/_libs distclean-libtool: -rm -f libtool config.lt @@ -4317,92 +2704,6 @@ uninstall-man4: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^4][0-9a-z]*$$,4,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man4dir)'; $(am__uninstall_files_from_dir) -install-man5: $(dist_man_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - @list1=''; \ - list2='$(dist_man_MANS) $(man_MANS)'; \ - test -n "$(man5dir)" \ - && test -n "`echo $$list1$$list2`" \ - || exit 0; \ - echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ - { for i in $$list1; do echo "$$i"; done; \ - if test -n "$$list2"; then \ - for i in $$list2; do echo "$$i"; done \ - | sed -n '/\.5[a-z]*$$/p'; \ - fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \ - fi; \ - done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \ - done; } - -uninstall-man5: - @$(NORMAL_UNINSTALL) - @list=''; test -n "$(man5dir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.5[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) -install-man7: $(dist_man_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - @list1=''; \ - list2='$(dist_man_MANS) $(man_MANS)'; \ - test -n "$(man7dir)" \ - && test -n "`echo $$list1$$list2`" \ - || exit 0; \ - echo " $(MKDIR_P) '$(DESTDIR)$(man7dir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(man7dir)" || exit 1; \ - { for i in $$list1; do echo "$$i"; done; \ - if test -n "$$list2"; then \ - for i in $$list2; do echo "$$i"; done \ - | sed -n '/\.7[a-z]*$$/p'; \ - fi; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \ - fi; \ - done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \ - done; } - -uninstall-man7: - @$(NORMAL_UNINSTALL) - @list=''; test -n "$(man7dir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.7[a-z]*$$/p'; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir) install-atf_aclocalDATA: $(atf_aclocal_DATA) @$(NORMAL_INSTALL) @list='$(atf_aclocal_DATA)'; test -n "$(atf_aclocaldir)" || list=; \ @@ -4508,27 +2809,6 @@ uninstall-atf_shpkgconfigDATA: @list='$(atf_shpkgconfig_DATA)'; test -n "$(atf_shpkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(atf_shpkgconfigdir)'; $(am__uninstall_files_from_dir) -install-cssDATA: $(css_DATA) - @$(NORMAL_INSTALL) - @list='$(css_DATA)'; test -n "$(cssdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(cssdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(cssdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cssdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(cssdir)" || exit $$?; \ - done - -uninstall-cssDATA: - @$(NORMAL_UNINSTALL) - @list='$(css_DATA)'; test -n "$(cssdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(cssdir)'; $(am__uninstall_files_from_dir) install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ @@ -4550,69 +2830,6 @@ uninstall-docDATA: @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) -install-dtdDATA: $(dtd_DATA) - @$(NORMAL_INSTALL) - @list='$(dtd_DATA)'; test -n "$(dtddir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(dtddir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(dtddir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dtddir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(dtddir)" || exit $$?; \ - done - -uninstall-dtdDATA: - @$(NORMAL_UNINSTALL) - @list='$(dtd_DATA)'; test -n "$(dtddir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(dtddir)'; $(am__uninstall_files_from_dir) -install-egDATA: $(eg_DATA) - @$(NORMAL_INSTALL) - @list='$(eg_DATA)'; test -n "$(egdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \ - done - -uninstall-egDATA: - @$(NORMAL_UNINSTALL) - @list='$(eg_DATA)'; test -n "$(egdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(egdir)'; $(am__uninstall_files_from_dir) -install-hooksDATA: $(hooks_DATA) - @$(NORMAL_INSTALL) - @list='$(hooks_DATA)'; test -n "$(hooksdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(hooksdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(hooksdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(hooksdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(hooksdir)" || exit $$?; \ - done - -uninstall-hooksDATA: - @$(NORMAL_UNINSTALL) - @list='$(hooks_DATA)'; test -n "$(hooksdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(hooksdir)'; $(am__uninstall_files_from_dir) install-pkgtestsDATA: $(pkgtests_DATA) @$(NORMAL_INSTALL) @list='$(pkgtests_DATA)'; test -n "$(pkgtestsdir)" || list=; \ @@ -4760,48 +2977,6 @@ uninstall-tests_test_programsDATA: @list='$(tests_test_programs_DATA)'; test -n "$(tests_test_programsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(tests_test_programsdir)'; $(am__uninstall_files_from_dir) -install-tests_toolsDATA: $(tests_tools_DATA) - @$(NORMAL_INSTALL) - @list='$(tests_tools_DATA)'; test -n "$(tests_toolsdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(tests_toolsdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(tests_toolsdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_toolsdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_toolsdir)" || exit $$?; \ - done - -uninstall-tests_toolsDATA: - @$(NORMAL_UNINSTALL) - @list='$(tests_tools_DATA)'; test -n "$(tests_toolsdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(tests_toolsdir)'; $(am__uninstall_files_from_dir) -install-xslDATA: $(xsl_DATA) - @$(NORMAL_INSTALL) - @list='$(xsl_DATA)'; test -n "$(xsldir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(xsldir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(xsldir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsldir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(xsldir)" || exit $$?; \ - done - -uninstall-xslDATA: - @$(NORMAL_UNINSTALL) - @list='$(xsl_DATA)'; test -n "$(xsldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(xsldir)'; $(am__uninstall_files_from_dir) install-atf_cHEADERS: $(atf_c_HEADERS) @$(NORMAL_INSTALL) @list='$(atf_c_HEADERS)'; test -n "$(atf_cdir)" || list=; \ @@ -5100,12 +3275,12 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ - $(MANS) $(DATA) $(HEADERS) bconfig.h +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ + $(HEADERS) bconfig.h install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(atf_aclocaldir)" "$(DESTDIR)$(atf_c__dirpkgconfigdir)" "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(egdir)" "$(DESTDIR)$(hooksdir)" "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_toolsdir)" "$(DESTDIR)$(xsldir)" "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" "$(DESTDIR)$(atf_aclocaldir)" "$(DESTDIR)$(atf_c__dirpkgconfigdir)" "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -5150,8 +3325,6 @@ distclean-generic: -rm -f bootstrap/$(am__dirstamp) -rm -f test-programs/$(DEPDIR)/$(am__dirstamp) -rm -f test-programs/$(am__dirstamp) - -rm -f tools/$(DEPDIR)/$(am__dirstamp) - -rm -f tools/$(am__dirstamp) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -5162,16 +3335,14 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \ - clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ - clean-tests_atf_cPROGRAMS clean-tests_atf_c__PROGRAMS \ - clean-tests_atf_c___detailPROGRAMS \ + clean-noinstLTLIBRARIES clean-tests_atf_cPROGRAMS \ + clean-tests_atf_c__PROGRAMS clean-tests_atf_c___detailPROGRAMS \ clean-tests_atf_c_detailPROGRAMS \ - clean-tests_test_programsPROGRAMS clean-tests_toolsPROGRAMS \ - mostlyclean-am + clean-tests_test_programsPROGRAMS mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-sh/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR) tools/$(DEPDIR) + -rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-sh/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-local distclean-tags @@ -5191,8 +3362,7 @@ info-am: install-data-am: install-atf_aclocalDATA install-atf_cHEADERS \ install-atf_c__HEADERS install-atf_c__dirpkgconfigDATA \ install-atf_cpkgconfigDATA install-atf_shDATA \ - install-atf_shpkgconfigDATA install-cssDATA install-docDATA \ - install-dtdDATA install-egDATA install-hooksDATA \ + install-atf_shpkgconfigDATA install-docDATA \ install-includeHEADERS install-man install-pkgtestsDATA \ install-tests_atf_cDATA install-tests_atf_cPROGRAMS \ install-tests_atf_cSCRIPTS install-tests_atf_c__DATA \ @@ -5203,9 +3373,7 @@ install-data-am: install-atf_aclocalDATA install-atf_cHEADERS \ install-tests_atf_c_detailPROGRAMS install-tests_atf_shDATA \ install-tests_atf_shSCRIPTS install-tests_test_programsDATA \ install-tests_test_programsPROGRAMS \ - install-tests_test_programsSCRIPTS install-tests_toolsDATA \ - install-tests_toolsPROGRAMS install-tests_toolsSCRIPTS \ - install-xslDATA + install-tests_test_programsSCRIPTS install-dvi: install-dvi-am @@ -5222,8 +3390,7 @@ install-info: install-info-am install-info-am: -install-man: install-man1 install-man3 install-man4 install-man5 \ - install-man7 +install-man: install-man1 install-man3 install-man4 install-pdf: install-pdf-am @@ -5238,7 +3405,7 @@ installcheck-am: installcheck-local maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-sh/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR) tools/$(DEPDIR) + -rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-sh/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -5259,8 +3426,7 @@ uninstall-am: uninstall-atf_aclocalDATA uninstall-atf_cHEADERS \ uninstall-atf_c__HEADERS uninstall-atf_c__dirpkgconfigDATA \ uninstall-atf_cpkgconfigDATA uninstall-atf_shDATA \ uninstall-atf_shpkgconfigDATA uninstall-binPROGRAMS \ - uninstall-cssDATA uninstall-docDATA uninstall-dtdDATA \ - uninstall-egDATA uninstall-hooksDATA uninstall-includeHEADERS \ + uninstall-docDATA uninstall-includeHEADERS \ uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \ uninstall-man uninstall-pkgtestsDATA uninstall-tests_atf_cDATA \ uninstall-tests_atf_cPROGRAMS uninstall-tests_atf_cSCRIPTS \ @@ -5273,42 +3439,37 @@ uninstall-am: uninstall-atf_aclocalDATA uninstall-atf_cHEADERS \ uninstall-tests_atf_shDATA uninstall-tests_atf_shSCRIPTS \ uninstall-tests_test_programsDATA \ uninstall-tests_test_programsPROGRAMS \ - uninstall-tests_test_programsSCRIPTS uninstall-tests_toolsDATA \ - uninstall-tests_toolsPROGRAMS uninstall-tests_toolsSCRIPTS \ - uninstall-xslDATA + uninstall-tests_test_programsSCRIPTS -uninstall-man: uninstall-man1 uninstall-man3 uninstall-man4 \ - uninstall-man5 uninstall-man7 +uninstall-man: uninstall-man1 uninstall-man3 uninstall-man4 .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-checkPROGRAMS clean-cscope \ clean-generic clean-libLTLIBRARIES clean-libexecPROGRAMS \ - clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES \ clean-tests_atf_cPROGRAMS clean-tests_atf_c__PROGRAMS \ clean-tests_atf_c___detailPROGRAMS \ clean-tests_atf_c_detailPROGRAMS \ - clean-tests_test_programsPROGRAMS clean-tests_toolsPROGRAMS \ - cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-local distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-atf_aclocalDATA \ - install-atf_cHEADERS install-atf_c__HEADERS \ - install-atf_c__dirpkgconfigDATA install-atf_cpkgconfigDATA \ - install-atf_shDATA install-atf_shpkgconfigDATA \ - install-binPROGRAMS install-cssDATA install-data \ - install-data-am install-docDATA install-dtdDATA install-dvi \ - install-dvi-am install-egDATA install-exec install-exec-am \ - install-hooksDATA install-html install-html-am \ + clean-tests_test_programsPROGRAMS cscope cscopelist-am ctags \ + ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \ + dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-local distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am \ + install-atf_aclocalDATA install-atf_cHEADERS \ + install-atf_c__HEADERS install-atf_c__dirpkgconfigDATA \ + install-atf_cpkgconfigDATA install-atf_shDATA \ + install-atf_shpkgconfigDATA install-binPROGRAMS install-data \ + install-data-am install-docDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-includeHEADERS install-info install-info-am \ install-libLTLIBRARIES install-libexecPROGRAMS install-man \ - install-man1 install-man3 install-man4 install-man5 \ - install-man7 install-pdf install-pdf-am install-pkgtestsDATA \ - install-ps install-ps-am install-strip install-tests_atf_cDATA \ + install-man1 install-man3 install-man4 install-pdf \ + install-pdf-am install-pkgtestsDATA install-ps install-ps-am \ + install-strip install-tests_atf_cDATA \ install-tests_atf_cPROGRAMS install-tests_atf_cSCRIPTS \ install-tests_atf_c__DATA install-tests_atf_c__PROGRAMS \ install-tests_atf_c__SCRIPTS install-tests_atf_c___detailDATA \ @@ -5317,21 +3478,18 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-man4 \ install-tests_atf_c_detailPROGRAMS install-tests_atf_shDATA \ install-tests_atf_shSCRIPTS install-tests_test_programsDATA \ install-tests_test_programsPROGRAMS \ - install-tests_test_programsSCRIPTS install-tests_toolsDATA \ - install-tests_toolsPROGRAMS install-tests_toolsSCRIPTS \ - install-xslDATA installcheck installcheck-am \ - installcheck-local installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-atf_aclocalDATA \ - uninstall-atf_cHEADERS uninstall-atf_c__HEADERS \ - uninstall-atf_c__dirpkgconfigDATA uninstall-atf_cpkgconfigDATA \ - uninstall-atf_shDATA uninstall-atf_shpkgconfigDATA \ - uninstall-binPROGRAMS uninstall-cssDATA uninstall-docDATA \ - uninstall-dtdDATA uninstall-egDATA uninstall-hooksDATA \ - uninstall-includeHEADERS uninstall-libLTLIBRARIES \ - uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \ - uninstall-man3 uninstall-man4 uninstall-man5 uninstall-man7 \ + install-tests_test_programsSCRIPTS installcheck \ + installcheck-am installcheck-local installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-atf_aclocalDATA uninstall-atf_cHEADERS \ + uninstall-atf_c__HEADERS uninstall-atf_c__dirpkgconfigDATA \ + uninstall-atf_cpkgconfigDATA uninstall-atf_shDATA \ + uninstall-atf_shpkgconfigDATA uninstall-binPROGRAMS \ + uninstall-docDATA uninstall-includeHEADERS \ + uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \ + uninstall-man uninstall-man1 uninstall-man3 uninstall-man4 \ uninstall-pkgtestsDATA uninstall-tests_atf_cDATA \ uninstall-tests_atf_cPROGRAMS uninstall-tests_atf_cSCRIPTS \ uninstall-tests_atf_c__DATA uninstall-tests_atf_c__PROGRAMS \ @@ -5343,9 +3501,7 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-man4 \ uninstall-tests_atf_shDATA uninstall-tests_atf_shSCRIPTS \ uninstall-tests_test_programsDATA \ uninstall-tests_test_programsPROGRAMS \ - uninstall-tests_test_programsSCRIPTS uninstall-tests_toolsDATA \ - uninstall-tests_toolsPROGRAMS uninstall-tests_toolsSCRIPTS \ - uninstall-xslDATA + uninstall-tests_test_programsSCRIPTS dist-hook: check-style @@ -5353,6 +3509,10 @@ check-style: $(srcdir)/admin/check-style.sh # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 + +# XXX For some reason, the nodist line above does not work as expected. +# Work this problem around. +dist-hook: kill-defs-h kill-defs-h: rm -f $(distdir)/atf-c/defs.h atf-c/atf-c.pc: $(srcdir)/atf-c/atf-c.pc.in Makefile @@ -5452,7 +3612,6 @@ distclean-local: echo 'm4_define(AT_PACKAGE_VERSION, @PACKAGE_VERSION@)'; \ echo 'm4_define(AT_PACKAGE_STRING, @PACKAGE_STRING@)'; \ echo 'm4_define(AT_PACKAGE_BUGREPORT, @PACKAGE_BUGREPORT@)'; \ - echo 'm4_define(ENABLE_TOOLS, @ENABLE_TOOLS@)'; \ } >$(srcdir)/bootstrap/package.m4 @target_srcdir@bootstrap/testsuite: $(srcdir)/bootstrap/testsuite.at \ @@ -5494,63 +3653,10 @@ test-programs/srcdir_test: $(srcdir)/test-programs/srcdir_test.sh dst="test-programs/srcdir_test"; $(BUILD_SH_TP) # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 -@ENABLE_TOOLS_TRUE@kill-defs-hpp: -@ENABLE_TOOLS_TRUE@ rm -f $(distdir)/tools/defs.hpp -@ENABLE_TOOLS_TRUE@tools/revision.h: tools/revision.h.stamp -@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools -@ENABLE_TOOLS_TRUE@ @cmp -s tools/revision.h tools/revision.h.stamp || \ -@ENABLE_TOOLS_TRUE@ cp -p tools/revision.h.stamp tools/revision.h -@ENABLE_TOOLS_TRUE@tools/revision.h.stamp: -@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools -@ENABLE_TOOLS_TRUE@ @$(top_srcdir)/tools/generate-revision.sh \ -@ENABLE_TOOLS_TRUE@ -g "$(GIT)" -r $(top_srcdir) -o tools/revision.h.stamp \ -@ENABLE_TOOLS_TRUE@ -v $(PACKAGE_VERSION) - -@ENABLE_TOOLS_TRUE@tools/atf.7: $(srcdir)/tools/atf.7.in -@ENABLE_TOOLS_TRUE@ test -d tools || mkdir -p tools -@ENABLE_TOOLS_TRUE@ sed -e 's#__DOCDIR__#$(docdir)#g' \ -@ENABLE_TOOLS_TRUE@ -e 's#__TESTSDIR__#$(testsdir)#g' \ -@ENABLE_TOOLS_TRUE@ <$(srcdir)/tools/atf.7.in >tools/atf.7.tmp -@ENABLE_TOOLS_TRUE@ mv tools/atf.7.tmp tools/atf.7 -@ENABLE_TOOLS_TRUE@tools/atf-config_test: $(srcdir)/tools/atf-config_test.sh -@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools -@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/tools/atf-config_test.sh"; \ -@ENABLE_TOOLS_TRUE@ dst="tools/atf-config_test"; $(BUILD_SH_TP) -@ENABLE_TOOLS_TRUE@tools/atf-report_test: $(srcdir)/tools/atf-report_test.sh -@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools -@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/tools/atf-report_test.sh"; \ -@ENABLE_TOOLS_TRUE@ dst="tools/atf-report_test"; $(BUILD_SH_TP) -@ENABLE_TOOLS_TRUE@tools/atf-run_test: $(srcdir)/tools/atf-run_test.sh -@ENABLE_TOOLS_TRUE@ @test -d tools || mkdir -p tools -@ENABLE_TOOLS_TRUE@ @src="$(srcdir)/tools/atf-run_test.sh"; \ -@ENABLE_TOOLS_TRUE@ dst="tools/atf-run_test"; $(BUILD_SH_TP) - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 -@ENABLE_TOOLS_TRUE@installcheck-atf: -@ENABLE_TOOLS_TRUE@ logfile=$$(pwd)/installcheck.log; \ -@ENABLE_TOOLS_TRUE@ fifofile=$$(pwd)/installcheck.fifo; \ -@ENABLE_TOOLS_TRUE@ cd $(pkgtestsdir); \ -@ENABLE_TOOLS_TRUE@ rm -f $${fifofile}; \ -@ENABLE_TOOLS_TRUE@ mkfifo $${fifofile}; \ -@ENABLE_TOOLS_TRUE@ cat $${fifofile} | tee $${logfile} | $(TESTS_ENVIRONMENT) atf-report & \ -@ENABLE_TOOLS_TRUE@ $(TESTS_ENVIRONMENT) atf-run >>$${fifofile}; \ -@ENABLE_TOOLS_TRUE@ res=$${?}; \ -@ENABLE_TOOLS_TRUE@ wait; \ -@ENABLE_TOOLS_TRUE@ rm $${fifofile}; \ -@ENABLE_TOOLS_TRUE@ echo; \ -@ENABLE_TOOLS_TRUE@ echo "The verbatim output of atf-run has been saved to" \ -@ENABLE_TOOLS_TRUE@ "installcheck.log; exit was $${res}"; \ -@ENABLE_TOOLS_TRUE@ test $${res} -eq 0 @HAVE_KYUA_TRUE@installcheck-kyua: @HAVE_KYUA_TRUE@ cd $(pkgtestsdir) && $(TESTS_ENVIRONMENT) $(KYUA) test installcheck-local: $(INSTALLCHECK_TARGETS) -@ENABLE_TOOLS_TRUE@forbid-dist: -@ENABLE_TOOLS_TRUE@ @true -@ENABLE_TOOLS_FALSE@forbid-dist: -@ENABLE_TOOLS_FALSE@ @echo "Sorry; cannot make dist without the tools enabled." -@ENABLE_TOOLS_FALSE@ @echo "Please reconfigure with --enable-tools." -@ENABLE_TOOLS_FALSE@ @false clean-all: GIT="$(GIT)" $(SH) $(srcdir)/admin/clean-all.sh release: @@ -5560,8 +3666,6 @@ release-test: .PHONY: $(PHONY_TARGETS) -dist-hook: $(DIST_HOOKS) - # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/NEWS b/NEWS index 6b3be1758d09..709f5941c105 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,19 @@ Major changes between releases Automated Testing Framework =========================================================================== +Changes in version 0.20 +*********************** + +Experimental version released on February 7th, 2014. + +This is the first release without the code for the deprecated tools. If +you require such code, please fetch a copy of the 0.19 release and extract +the 'tools' directory for your own consumption. + +* Removed the deprecated tools. This includes atf-config, atf-report, + atf-run and atf-version. + + Changes in version 0.19 *********************** diff --git a/README b/README index 00caa122a39c..d3b03edb9419 100644 --- a/README +++ b/README @@ -5,21 +5,18 @@ Introductory information Automated Testing Framework Introduction ************ -The Automated Testing Framework (ATF) is a collection of libraries and -utilities designed to ease unattended application testing in the hands of -developers and end users of a specific piece of software. +The Automated Testing Framework (ATF) is a collection of libraries to +implement test programs in a variety of languages. At the moment, ATF +offers C, C++ and POSIX shell bindings with which to implement tests. +These bindings all offer a similar set of functionality and any test +program written with them exposes a consistent user interface. -As regards developers, ATF provides the necessary means to easily create -test suites composed of multiple test programs, which in turn are a -collection of test cases. It also attempts to simplify the debugging of -problems when these test cases detect an error by providing as much -information as possible about the failure. - -As regards users, it simplifies the process of running the test suites and, -in special, encourages end users to run them often: they do not need to -have source trees around nor any other development tools installed to be -able to certify that a given piece of software works on their machine as -advertised. +ATF-based test programs rely on a separate runtime engine to execute them. +The runtime engine is in charge of isolating the test programs from the +rest of the system to ensure that their results are deterministic and that +they cannot affect the running system. The runtime engine is also +responsible for gathering the results of all tests and composing reports. +The current runtime of choice is Kyua. Other documents diff --git a/aclocal.m4 b/aclocal.m4 index 399c24dbaf8b..6535b6fdd790 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1219,5 +1219,4 @@ m4_include([m4/module-application.m4]) m4_include([m4/module-defs.m4]) m4_include([m4/module-env.m4]) m4_include([m4/module-fs.m4]) -m4_include([m4/module-signals.m4]) m4_include([m4/runtime-tool.m4]) diff --git a/admin/check-style.sh b/admin/check-style.sh index c43322caa4a9..d5fa755ae0fc 100755 --- a/admin/check-style.sh +++ b/admin/check-style.sh @@ -108,7 +108,7 @@ find_sources() { \! -name "ltsugar.m4" \ \! -name "lt~obsolete.m4" \ \! -name "*.so.*" \ - \) | grep -v tools/ + \) } # diff --git a/atf-c++/Atffile b/atf-c++/Atffile deleted file mode 100644 index ba11f2181cf2..000000000000 --- a/atf-c++/Atffile +++ /dev/null @@ -1,14 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: detail - -tp: atf_c++_test -tp: build_test -tp: check_test -tp: config_test -tp: macros_test -tp: pkg_config_test -tp: tests_test -tp: utils_test diff --git a/atf-c++/Makefile.am.inc b/atf-c++/Makefile.am.inc index cfe70695dd16..e4b377eeedca 100644 --- a/atf-c++/Makefile.am.inc +++ b/atf-c++/Makefile.am.inc @@ -71,8 +71,7 @@ atf-c++/atf-c++.pc: $(srcdir)/atf-c++/atf-c++.pc.in Makefile <$(srcdir)/atf-c++/atf-c++.pc.in >atf-c++/atf-c++.pc.tmp mv atf-c++/atf-c++.pc.tmp atf-c++/atf-c++.pc -tests_atf_c___DATA = atf-c++/Atffile \ - atf-c++/Kyuafile \ +tests_atf_c___DATA = atf-c++/Kyuafile \ atf-c++/macros_hpp_test.cpp \ atf-c++/unused_test.cpp tests_atf_c__dir = $(pkgtestsdir)/atf-c++ diff --git a/atf-c++/detail/Atffile b/atf-c++/detail/Atffile deleted file mode 100644 index 75adc690b65b..000000000000 --- a/atf-c++/detail/Atffile +++ /dev/null @@ -1,11 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: application_test -tp: auto_array_test -tp: env_test -tp: exceptions_test -tp: fs_test -tp: sanity_test -tp: text_test diff --git a/atf-c++/detail/Makefile.am.inc b/atf-c++/detail/Makefile.am.inc index ce8701fcc221..7bcd11b99acf 100644 --- a/atf-c++/detail/Makefile.am.inc +++ b/atf-c++/detail/Makefile.am.inc @@ -42,8 +42,7 @@ libatf_c___la_SOURCES += atf-c++/detail/application.cpp \ atf-c++/detail/text.cpp \ atf-c++/detail/text.hpp -tests_atf_c___detail_DATA = atf-c++/detail/Atffile \ - atf-c++/detail/Kyuafile +tests_atf_c___detail_DATA = atf-c++/detail/Kyuafile tests_atf_c___detaildir = $(pkgtestsdir)/atf-c++/detail EXTRA_DIST += $(tests_atf_c___detail_DATA) diff --git a/atf-c/Atffile b/atf-c/Atffile deleted file mode 100644 index 522e6f4c5195..000000000000 --- a/atf-c/Atffile +++ /dev/null @@ -1,16 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: detail - -tp: atf_c_test -tp: build_test -tp: check_test -tp: config_test -tp: error_test -tp: macros_test -tp: pkg_config_test -tp: tc_test -tp: tp_test -tp: utils_test diff --git a/atf-c/Makefile.am.inc b/atf-c/Makefile.am.inc index d32e978c71fd..37d3cf79b239 100644 --- a/atf-c/Makefile.am.inc +++ b/atf-c/Makefile.am.inc @@ -60,7 +60,7 @@ libatf_c_la_LDFLAGS = -version-info 0:0:0 # XXX For some reason, the nodist line above does not work as expected. # Work this problem around. -DIST_HOOKS += kill-defs-h +dist-hook: kill-defs-h kill-defs-h: rm -f $(distdir)/atf-c/defs.h @@ -95,8 +95,7 @@ atf-c/atf-c.pc: $(srcdir)/atf-c/atf-c.pc.in Makefile <$(srcdir)/atf-c/atf-c.pc.in >atf-c/atf-c.pc.tmp mv atf-c/atf-c.pc.tmp atf-c/atf-c.pc -tests_atf_c_DATA = atf-c/Atffile \ - atf-c/Kyuafile \ +tests_atf_c_DATA = atf-c/Kyuafile \ atf-c/macros_h_test.c \ atf-c/unused_test.c tests_atf_cdir = $(pkgtestsdir)/atf-c diff --git a/atf-c/detail/Atffile b/atf-c/detail/Atffile deleted file mode 100644 index 5fd859382c56..000000000000 --- a/atf-c/detail/Atffile +++ /dev/null @@ -1,13 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: dynstr_test -tp: env_test -tp: fs_test -tp: list_test -tp: map_test -tp: process_test -tp: sanity_test -tp: text_test -tp: user_test diff --git a/atf-c/detail/Makefile.am.inc b/atf-c/detail/Makefile.am.inc index 8116a24e8215..dbf88f346e1b 100644 --- a/atf-c/detail/Makefile.am.inc +++ b/atf-c/detail/Makefile.am.inc @@ -47,8 +47,7 @@ libatf_c_la_SOURCES += atf-c/detail/dynstr.c \ atf-c/detail/user.c \ atf-c/detail/user.h -tests_atf_c_detail_DATA = atf-c/detail/Atffile \ - atf-c/detail/Kyuafile +tests_atf_c_detail_DATA = atf-c/detail/Kyuafile tests_atf_c_detaildir = $(pkgtestsdir)/atf-c/detail EXTRA_DIST += $(tests_atf_c_detail_DATA) diff --git a/atf-sh/Atffile b/atf-sh/Atffile deleted file mode 100644 index f1735c308816..000000000000 --- a/atf-sh/Atffile +++ /dev/null @@ -1,11 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: tc_test -tp: tp_test -tp: normalize_test -tp: config_test -tp: atf-check_test -tp: atf_check_test -tp: integration_test diff --git a/atf-sh/Makefile.am.inc b/atf-sh/Makefile.am.inc index f8f521a4c7f3..1d0e09842adf 100644 --- a/atf-sh/Makefile.am.inc +++ b/atf-sh/Makefile.am.inc @@ -57,8 +57,7 @@ atf-sh/atf-sh.pc: $(srcdir)/atf-sh/atf-sh.pc.in Makefile <$(srcdir)/atf-sh/atf-sh.pc.in >atf-sh/atf-sh.pc.tmp mv atf-sh/atf-sh.pc.tmp atf-sh/atf-sh.pc -tests_atf_sh_DATA = atf-sh/Atffile \ - atf-sh/Kyuafile +tests_atf_sh_DATA = atf-sh/Kyuafile tests_atf_shdir = $(pkgtestsdir)/atf-sh EXTRA_DIST += $(tests_atf_sh_DATA) diff --git a/bconfig.h.in b/bconfig.h.in index de45ed965b38..2613d24193e9 100644 --- a/bconfig.h.in +++ b/bconfig.h.in @@ -57,9 +57,6 @@ /* Define to 1 if vsnprintf is in std */ #undef HAVE_VSNPRINTF_IN_STD -/* Define to the last valid signal number */ -#undef LAST_SIGNO - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff --git a/bootstrap/Makefile.am.inc b/bootstrap/Makefile.am.inc index 83033946828d..0f95b98f0ca8 100644 --- a/bootstrap/Makefile.am.inc +++ b/bootstrap/Makefile.am.inc @@ -27,15 +27,7 @@ # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -check_PROGRAMS = bootstrap/h_app_empty -bootstrap_h_app_empty_SOURCES = bootstrap/h_app_empty.cpp -bootstrap_h_app_empty_LDADD = tools/libtools.a $(ATF_CXX_LIBS) - -check_PROGRAMS += bootstrap/h_app_opts_args -bootstrap_h_app_opts_args_SOURCES = bootstrap/h_app_opts_args.cpp -bootstrap_h_app_opts_args_LDADD = tools/libtools.a $(ATF_CXX_LIBS) - -check_PROGRAMS += bootstrap/h_tp_basic_c +check_PROGRAMS = bootstrap/h_tp_basic_c bootstrap_h_tp_basic_c_SOURCES = bootstrap/h_tp_basic_c.c bootstrap_h_tp_basic_c_LDADD = libatf-c.la @@ -85,11 +77,7 @@ EXTRA_DIST += bootstrap/testsuite \ bootstrap/testsuite.at \ $(testsuite_incs) -testsuite_incs= $(srcdir)/bootstrap/t_application_help.at \ - $(srcdir)/bootstrap/t_application_opts_args.at \ - $(srcdir)/bootstrap/t_atf_config.at \ - $(srcdir)/bootstrap/t_atf_run.at \ - $(srcdir)/bootstrap/t_subr_atf_check.at \ +testsuite_incs= $(srcdir)/bootstrap/t_subr_atf_check.at \ $(srcdir)/bootstrap/t_test_program_compare.at \ $(srcdir)/bootstrap/t_test_program_filter.at \ $(srcdir)/bootstrap/t_test_program_list.at \ @@ -103,7 +91,6 @@ testsuite_incs= $(srcdir)/bootstrap/t_application_help.at \ echo 'm4_define(AT_PACKAGE_VERSION, @PACKAGE_VERSION@)'; \ echo 'm4_define(AT_PACKAGE_STRING, @PACKAGE_STRING@)'; \ echo 'm4_define(AT_PACKAGE_BUGREPORT, @PACKAGE_BUGREPORT@)'; \ - echo 'm4_define(ENABLE_TOOLS, @ENABLE_TOOLS@)'; \ } >$(srcdir)/bootstrap/package.m4 @target_srcdir@bootstrap/testsuite: $(srcdir)/bootstrap/testsuite.at \ diff --git a/bootstrap/h_app_empty.cpp b/bootstrap/h_app_empty.cpp deleted file mode 100644 index 9656f00135b8..000000000000 --- a/bootstrap/h_app_empty.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include "tools/application.hpp" - -class h_app_empty : public tools::application::app { - static const char* m_description; - -public: - h_app_empty(void); - - int main(void); -}; - -const char* h_app_empty::m_description = - "A helper application for the bootstrap test suite that does nothing " - "on its own and redefines no methods."; - -h_app_empty::h_app_empty(void) : - app(m_description, "h_app_empty(1)", "atf(7)") -{ -} - -int -h_app_empty::main(void) -{ - return EXIT_SUCCESS; -} - -int -main(int argc, char* const* argv) -{ - return h_app_empty().run(argc, argv); -} diff --git a/bootstrap/h_app_opts_args.cpp b/bootstrap/h_app_opts_args.cpp deleted file mode 100644 index f05a6b2bb130..000000000000 --- a/bootstrap/h_app_opts_args.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include - -#include "tools/application.hpp" - -class h_app_opts_args : public tools::application::app { - static const char* m_description; - - std::string specific_args(void) const; - options_set specific_options(void) const; - void process_option(int, const char*); - -public: - h_app_opts_args(void); - - int main(void); -}; - -const char* h_app_opts_args::m_description = - "A helper application for the bootstrap test suite that redefines the " - "methods to specify custom options and arguments."; - -h_app_opts_args::h_app_opts_args(void) : - app(m_description, "h_app_opts_args(1)", "atf(7)") -{ -} - -std::string -h_app_opts_args::specific_args(void) - const -{ - return " "; -} - -h_app_opts_args::options_set -h_app_opts_args::specific_options(void) - const -{ - using tools::application::option; - options_set opts; - opts.insert(option('d', "", "Debug mode")); - opts.insert(option('v', "level", "Verbosity level")); - return opts; -} - -void -h_app_opts_args::process_option(int ch, const char* arg) -{ - switch (ch) { - case 'd': - std::cout << "-d given\n"; - break; - - case 'v': - std::cout << "-v given with argument " << arg << "\n"; - break; - - default: - std::abort(); - } -} - -int -h_app_opts_args::main(void) -{ - return EXIT_SUCCESS; -} - -int -main(int argc, char* const* argv) -{ - return h_app_opts_args().run(argc, argv); -} diff --git a/bootstrap/package.m4 b/bootstrap/package.m4 index c18cb4f0d407..9cba60fd02e4 100644 --- a/bootstrap/package.m4 +++ b/bootstrap/package.m4 @@ -1,7 +1,6 @@ # Signature of the current package. m4_define(AT_PACKAGE_NAME, Automated Testing Framework) m4_define(AT_PACKAGE_TARNAME, atf) -m4_define(AT_PACKAGE_VERSION, 0.19) -m4_define(AT_PACKAGE_STRING, Automated Testing Framework 0.19) +m4_define(AT_PACKAGE_VERSION, 0.20) +m4_define(AT_PACKAGE_STRING, Automated Testing Framework 0.20) m4_define(AT_PACKAGE_BUGREPORT, atf-devel@NetBSD.org) -m4_define(ENABLE_TOOLS, yes) diff --git a/bootstrap/t_application_help.at b/bootstrap/t_application_help.at deleted file mode 100644 index 7686fea2c1e6..000000000000 --- a/bootstrap/t_application_help.at +++ /dev/null @@ -1,40 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright (c) 2007 The NetBSD Foundation, Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions -dnl are met: -dnl 1. Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl 2. Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -AT_SETUP([application: online help option]) - -AT_CHECK([APP_HELPER(app_empty)], 0, [stdout], []) -AT_CHECK([grep 'Available options' stdout], 1, [ignore], []) - -AT_CHECK([APP_HELPER(app_empty) -h], 0, [stdout], []) -AT_CHECK([grep 'Available options' stdout], 0, [ignore], []) - -AT_CLEANUP() - -dnl vim: syntax=m4:expandtab:shiftwidth=4:softtabstop=4 diff --git a/bootstrap/t_application_opts_args.at b/bootstrap/t_application_opts_args.at deleted file mode 100644 index 0c36cef77631..000000000000 --- a/bootstrap/t_application_opts_args.at +++ /dev/null @@ -1,86 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright (c) 2007 The NetBSD Foundation, Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions -dnl are met: -dnl 1. Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl 2. Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -AT_SETUP([application: arguments and options handling]) - -dnl Check that an application that does not redefine any method does -dnl not show strange flags in the usage message. -AT_CHECK([APP_HELPER(app_empty) -h], 0, [stdout], []) -AT_CHECK([grep ' -d ' stdout], 1, [ignore], []) -AT_CHECK([grep ' -h ' stdout], 0, [ignore], []) -AT_CHECK([grep ' -v ' stdout], 1, [ignore], []) -AT_CHECK([grep ' -z ' stdout], 1, [ignore], []) - -dnl Check that an application that adds its own options shows them in -dnl the usage message. -AT_CHECK([APP_HELPER(app_opts_args) -h], 0, [stdout], []) -AT_CHECK([grep ' -d ' stdout], 0, [ignore], []) -AT_CHECK([grep ' -h ' stdout], 0, [ignore], []) -AT_CHECK([grep ' -v ' stdout], 0, [ignore], []) -AT_CHECK([grep ' -z ' stdout], 1, [ignore], []) - -dnl Check that an application that does not redefine any method does -dnl not recognize strange flags. -AT_CHECK([APP_HELPER(app_empty) -d], 1, [], [stderr]) -AT_CHECK([grep 'Unknown option.*-d' stderr], 0, [ignore], []) -AT_CHECK([APP_HELPER(app_empty) -v], 1, [], [stderr]) -AT_CHECK([grep 'Unknown option.*-v' stderr], 0, [ignore], []) -AT_CHECK([APP_HELPER(app_empty) -z], 1, [], [stderr]) -AT_CHECK([grep 'Unknown option.*-z' stderr], 0, [ignore], []) - -dnl Check that an application that adds its own options is able to -dnl properly handle them. -AT_CHECK([APP_HELPER(app_opts_args) -d], 0, [stdout], []) -AT_CHECK([grep -- '-d given' stdout], 0, [ignore], []) -AT_CHECK([APP_HELPER(app_opts_args) -v], 1, [], [stderr]) -AT_CHECK([grep 'Option.*-v.*requires an argument' stderr], 0, [ignore], []) -AT_CHECK([APP_HELPER(app_opts_args) -v foo], 0, [stdout], []) -AT_CHECK([grep -- '-v given with argument foo' stdout], 0, [ignore], []) -AT_CHECK([APP_HELPER(app_opts_args) -z], 1, [], [stderr]) -AT_CHECK([grep 'Unknown option.*-z' stderr], 0, [ignore], []) - -dnl Check that option processing stops after an argument. -AT_CHECK([APP_HELPER(app_opts_args) -- -d], 0, [stdout], []) -AT_CHECK([grep -- '-d given' stdout], 1, [], []) -AT_CHECK([APP_HELPER(app_opts_args) arg -d], 0, [stdout], []) -AT_CHECK([grep -- '-d given' stdout], 1, [], []) - -dnl Check that an application that does not redefine any method does -dnl not show unexpected arguments in the usage message. -AT_CHECK([APP_HELPER(app_empty) -h], 0, [stdout], []) -AT_CHECK([grep '\@<:@options\@:>@$' stdout], 0, [ignore], []) - -dnl Check that an application that defines the arguments it takes -dnl shows them in the usage message. -AT_CHECK([APP_HELPER(app_opts_args) -h], 0, [stdout], []) -AT_CHECK([grep '\@<:@options\@:>@ ' stdout], 0, [ignore], []) - -AT_CLEANUP() - -dnl vim: syntax=m4:expandtab:shiftwidth=4:softtabstop=4 diff --git a/bootstrap/t_atf_config.at b/bootstrap/t_atf_config.at deleted file mode 100644 index a86316999256..000000000000 --- a/bootstrap/t_atf_config.at +++ /dev/null @@ -1,108 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright (c) 2007 The NetBSD Foundation, Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions -dnl are met: -dnl 1. Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl 2. Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -AT_SETUP([atf-config: querying of build-time variables]) -AT_TESTED(atf-config) - -all_vars="atf_arch \ - atf_build_cc \ - atf_build_cflags \ - atf_build_cpp \ - atf_build_cppflags \ - atf_build_cxx \ - atf_build_cxxflags \ - atf_confdir \ - atf_includedir \ - atf_libdir \ - atf_libexecdir \ - atf_machine \ - atf_pkgdatadir \ - atf_shell \ - atf_workdir" -all_vars_no=15 - -dnl List all variables. -AT_CHECK([atf-config], [0], [stdout], []) -AT_CHECK([COUNT_LINES(stdout, ${all_vars_no})], [0], [], []) -for v in ${all_vars}; do - AT_CHECK([grep "${v}" stdout], [0], [ignore], []) -done - -dnl Query a single variable and test terse mode. -for v in ${all_vars}; do - AT_CHECK([atf-config ${v}], [0], [stdout], []) - AT_CHECK([COUNT_LINES(stdout, 1)], [0], [], []) - AT_CHECK([grep "${v}" stdout], [0], [ignore], []) - AT_CHECK([cut -d ' ' -f 3- stdout], [0], [stdout], []) - AT_CHECK([mv stdout expout], [0], [], []) - AT_CHECK([atf-config -t ${v}], [0], [expout], []) -done - -dnl Query several variables. -AT_CHECK([atf-config atf_libexecdir atf_pkgdatadir], [0], [stdout], []) -AT_CHECK([grep 'atf_libexecdir' stdout], [0], [ignore], []) -AT_CHECK([grep 'atf_pkgdatadir' stdout], [0], [ignore], []) -AT_CHECK([COUNT_LINES(stdout, 2)], [0], [ignore], []) - -dnl Query a non-existent variable. -AT_CHECK([atf-config non_existent], [1], [], [stderr]) -AT_CHECK([grep 'Unknown variable.*non_existent' stderr], [0], [ignore], []) - -dnl Query an existent and non-existent variable. -for v in ${all_vars}; do - AT_CHECK([atf-config ${v} non_existent], [1], [], [stderr]) - AT_CHECK([grep 'Unknown variable.*non_existent' stderr], - [0], [ignore], []) - AT_CHECK([atf-config non_existent ${v}], [1], [], [stderr]) - AT_CHECK([grep 'Unknown variable.*non_existent' stderr], - [0], [ignore], []) -done - -dnl Override every variable through the environment. -for v in ${all_vars}; do - V=$(echo ${v} | tr '@<:@a-z@:>@' '@<:@A-Z@:>@') - AT_CHECK([env ${V}=testval atf-config], [0], [stdout], []) - AT_CHECK([mv stdout all], [0], [], []) - - AT_CHECK([grep "^${v} : " all], [0], [stdout], []) - AT_CHECK([mv stdout affected], [0], [], []) - AT_CHECK([grep -v "^${v} : " all], [0], [stdout], []) - AT_CHECK([mv stdout unaffected], [0], [], []) - - AT_CHECK([COUNT_LINES(affected, 1)], [0], [ignore], []) - AT_CHECK([COUNT_LINES(unaffected, $((${all_vars_no} - 1)))], - [0], [ignore], []) - - AT_CHECK([grep "^${v} : testval$" affected], [0], [ignore], []) - AT_CHECK([grep ' : testval$' unaffected], [1], [], []) -done - -AT_CLEANUP() - -dnl vim: syntax=m4:expandtab:shiftwidth=4:softtabstop=4 diff --git a/bootstrap/t_atf_run.at b/bootstrap/t_atf_run.at deleted file mode 100644 index db09deb2cd24..000000000000 --- a/bootstrap/t_atf_run.at +++ /dev/null @@ -1,178 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright (c) 2007 The NetBSD Foundation, Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions -dnl are met: -dnl 1. Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl 2. Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -AT_SETUP([atf-run: execution of tests]) -AT_TESTED(atf-run) - -m4_define([CREATE_PASS_TEST], -[AT_CHECK([sed -e 's,@TC_NAME@,$2,g' @' stdout], [1], [], []) -AT_CHECK([grep 'tc-so:ignore-me' stdout], [0], [ignore], []) -AT_CHECK([grep 'tc-se:ignore-me' stdout], [0], [ignore], []) - -AT_CHECK([cd top/dir2 && atf-run], [1], [stdout], [stderr]) -CHECK_TPS_TCR(tc_4, failed, stdout) -CHECK_TPS_TCR(tc_5, passed, stdout) -AT_CHECK([grep -i 'tc_@<:@123@:>@' stdout], [1], [], []) -AT_CHECK([grep 'tc-so:ignore-me' stdout], [0], [ignore], []) -AT_CHECK([grep 'tc-se:ignore-me' stdout], [0], [ignore], []) - -AT_CHECK([cd top && atf-run], [1], [stdout], [stderr]) -CHECK_TPS_TCR(tc_1, passed, stdout) -CHECK_TPS_TCR(tc_2, failed, stdout) -CHECK_TPS_TCR(tc_3, passed, stdout) -CHECK_TPS_TCR(tc_4, failed, stdout) -CHECK_TPS_TCR(tc_5, passed, stdout) -AT_CHECK([grep 'tc-so:ignore-me' stdout], [0], [ignore], []) -AT_CHECK([grep 'tc-se:ignore-me' stdout], [0], [ignore], []) - -dnl Repeat previous but using a glob that matches everything. -AT_DATA([top/Atffile], -[Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: * -]) -AT_CHECK([cd top && atf-run], [1], [stdout], [stderr]) -CHECK_TPS_TCR(tc_1, passed, stdout) -CHECK_TPS_TCR(tc_2, failed, stdout) -CHECK_TPS_TCR(tc_3, passed, stdout) -CHECK_TPS_TCR(tc_4, failed, stdout) -CHECK_TPS_TCR(tc_5, passed, stdout) -AT_CHECK([grep 'tc-so:ignore-me' stdout], [0], [ignore], []) -AT_CHECK([grep 'tc-se:ignore-me' stdout], [0], [ignore], []) - -dnl Repeat previous but using a glob that matches directories only. -AT_DATA([top/Atffile], -[Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: d* -]) -AT_CHECK([cd top && atf-run], [1], [stdout], [stderr]) -CHECK_TPS_TCR(tc_3, passed, stdout) -CHECK_TPS_TCR(tc_4, failed, stdout) -CHECK_TPS_TCR(tc_5, passed, stdout) -AT_CHECK([grep 'tc-so:ignore-me' stdout], [0], [ignore], []) -AT_CHECK([grep 'tc-se:ignore-me' stdout], [0], [ignore], []) - -dnl Make sure globs do not match non-executable nor hidden files. -dnl XXX This is not really part of the bootstrap test suite. Move to -dnl tests/atf/tools/t_atf_run.sh when it exists. -AT_CHECK([rm -rf top], [0], [], []) -AT_CHECK([mkdir top], [0], [], []) -CREATE_PASS_TEST([top/test1], [tc_1]) -CREATE_PASS_TEST([top/test2], [tc_2]) -CREATE_PASS_TEST([top/test3], [tc_3]) -AT_CHECK([chmod -x top/test3], [0], [], []) -CREATE_PASS_TEST([top/.test4], [tc_4]) -AT_CHECK([chmod -x top/.test4], [0], [], []) -AT_DATA([top/Atffile], -[Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: * -]) -AT_CHECK([cd top && atf-run], [0], [stdout], [stderr]) -CHECK_TPS_TCR(tc_1, passed, stdout) -CHECK_TPS_TCR(tc_2, passed, stdout) -AT_CHECK([grep -i 'tc_3' stdout], [1], [ignore], []) -AT_CHECK([grep -i 'tc_4' stdout], [1], [ignore], []) - -dnl Run all test cases from a test program. -AT_CHECK([rm -rf top], [0], [], []) -AT_CHECK([mkdir top], [0], [], []) -AT_CHECK([cp TEST_HELPER_NO_S(tp_basic_sh) top]) -AT_DATA([top/Atffile], -[Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: h_tp_basic_sh -]) -AT_CHECK([cd top && atf-run], [1], [stdout], [stderr]) -CHECK_TPS_TCR(pass, passed, stdout) -CHECK_TPS_TCR(fail, failed, stdout) -CHECK_TPS_TCR(skip, skipped, stdout) -CHECK_TPS_TCR(default, passed, stdout) - -AT_CLEANUP() - -dnl vim: syntax=m4:expandtab:shiftwidth=4:softtabstop=4 diff --git a/bootstrap/testsuite b/bootstrap/testsuite index 7ec66f2051be..03c5d0198326 100755 --- a/bootstrap/testsuite +++ b/bootstrap/testsuite @@ -584,8 +584,7 @@ at_change_dir=false # Whether to enable colored test results. at_color=no # List of the tested programs. -at_tested='atf-config -atf-run' +at_tested='' # As many question marks as there are digits in the last test group number. # Used to normalize the test group numbers so that `ls' lists them in # numerical order. @@ -596,10 +595,6 @@ at_help_all="1;t_test_program_filter.at:30;test_program: filter test cases by na 3;t_test_program_list.at:30;test_program: list test cases;; 4;t_test_program_compare.at:30;test_program: compare the user-visible interfaces;; 5;t_subr_atf_check.at:30;subr: atf_check function;; -6;t_application_opts_args.at:30;application: arguments and options handling;; -7;t_application_help.at:30;application: online help option;; -8;t_atf_config.at:30;atf-config: querying of build-time variables;; -9;t_atf_run.at:30;atf-run: execution of tests;; " # List of the all the test groups. at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'` @@ -613,7 +608,7 @@ at_fn_validate_ranges () for at_grp do eval at_value=\$$at_grp - if test $at_value -lt 1 || test $at_value -gt 9; then + if test $at_value -lt 1 || test $at_value -gt 5; then $as_echo "invalid test group: $at_value" >&2 exit 1 fi @@ -911,7 +906,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -Automated Testing Framework 0.19 test suite: bootstrap tests test groups: +Automated Testing Framework 0.20 test suite: bootstrap tests test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -952,7 +947,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (Automated Testing Framework 0.19)" && + $as_echo "$as_me (Automated Testing Framework 0.20)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1129,11 +1124,11 @@ exec 5>>"$at_suite_log" # Banners and logs. $as_echo "## ------------------------------------------------------------- ## -## Automated Testing Framework 0.19 test suite: bootstrap tests. ## +## Automated Testing Framework 0.20 test suite: bootstrap tests. ## ## ------------------------------------------------------------- ##" { $as_echo "## ------------------------------------------------------------- ## -## Automated Testing Framework 0.19 test suite: bootstrap tests. ## +## Automated Testing Framework 0.20 test suite: bootstrap tests. ## ## ------------------------------------------------------------- ##" echo @@ -1977,7 +1972,7 @@ _ASBOX $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [Automated Testing Framework 0.19] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [Automated Testing Framework 0.20] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may @@ -5876,2471 +5871,3 @@ $at_traceon; } ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" #AT_STOP_5 -#AT_START_6 -at_fn_group_banner 6 't_application_opts_args.at:30' \ - "application: arguments and options handling" " " -at_xfail=no -( - $as_echo "6. $at_setup_line: testing $at_desc ..." - $at_traceon - - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:34: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_empty -h" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:34" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_empty -h -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:34" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:35: grep ' -d ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:35" -( $at_check_trace; grep ' -d ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:35" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:36: grep ' -h ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:36" -( $at_check_trace; grep ' -h ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:36" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:37: grep ' -v ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:37" -( $at_check_trace; grep ' -v ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:37" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:38: grep ' -z ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:38" -( $at_check_trace; grep ' -z ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:38" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:42: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_opts_args -h" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:42" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_opts_args -h -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:42" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:43: grep ' -d ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:43" -( $at_check_trace; grep ' -d ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:43" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:44: grep ' -h ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:44" -( $at_check_trace; grep ' -h ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:44" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:45: grep ' -v ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:45" -( $at_check_trace; grep ' -v ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:45" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:46: grep ' -z ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:46" -( $at_check_trace; grep ' -z ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:46" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:50: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_empty -d" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:50" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_empty -d -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:50" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:51: grep 'Unknown option.*-d' stderr" -at_fn_check_prepare_trace "t_application_opts_args.at:51" -( $at_check_trace; grep 'Unknown option.*-d' stderr -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:51" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:52: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_empty -v" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:52" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_empty -v -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:52" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:53: grep 'Unknown option.*-v' stderr" -at_fn_check_prepare_trace "t_application_opts_args.at:53" -( $at_check_trace; grep 'Unknown option.*-v' stderr -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:53" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:54: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_empty -z" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:54" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_empty -z -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:54" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:55: grep 'Unknown option.*-z' stderr" -at_fn_check_prepare_trace "t_application_opts_args.at:55" -( $at_check_trace; grep 'Unknown option.*-z' stderr -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:55" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:59: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_opts_args -d" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:59" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_opts_args -d -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:59" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:60: grep -- '-d given' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:60" -( $at_check_trace; grep -- '-d given' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:60" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:61: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_opts_args -v" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:61" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_opts_args -v -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:61" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:62: grep 'Option.*-v.*requires an argument' stderr" -at_fn_check_prepare_trace "t_application_opts_args.at:62" -( $at_check_trace; grep 'Option.*-v.*requires an argument' stderr -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:62" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:63: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_opts_args -v foo" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:63" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_opts_args -v foo -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:63" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:64: grep -- '-v given with argument foo' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:64" -( $at_check_trace; grep -- '-v given with argument foo' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:64" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:65: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_opts_args -z" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:65" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_opts_args -z -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:65" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:66: grep 'Unknown option.*-z' stderr" -at_fn_check_prepare_trace "t_application_opts_args.at:66" -( $at_check_trace; grep 'Unknown option.*-z' stderr -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:66" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:69: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_opts_args -- -d" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:69" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_opts_args -- -d -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:69" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:70: grep -- '-d given' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:70" -( $at_check_trace; grep -- '-d given' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:70" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:71: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_opts_args arg -d" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:71" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_opts_args arg -d -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:71" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:72: grep -- '-d given' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:72" -( $at_check_trace; grep -- '-d given' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_application_opts_args.at:72" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:76: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_empty -h" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:76" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_empty -h -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:76" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:77: grep '\\[options\\]\$' stdout" -at_fn_check_prepare_dynamic "grep '\\[options\\]$' stdout" "t_application_opts_args.at:77" -( $at_check_trace; grep '\[options\]$' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:77" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:81: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_opts_args -h" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_opts_args.at:81" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_opts_args -h -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:81" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_opts_args.at:82: grep '\\[options\\] ' stdout" -at_fn_check_prepare_trace "t_application_opts_args.at:82" -( $at_check_trace; grep '\[options\] ' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_opts_args.at:82" -$at_failed && at_fn_log_failure -$at_traceon; } - - - set +x - $at_times_p && times >"$at_times_file" -) 5>&1 2>&1 7>&- | eval $at_tee_pipe -read at_status <"$at_status_file" -#AT_STOP_6 -#AT_START_7 -at_fn_group_banner 7 't_application_help.at:30' \ - "application: online help option" " " -at_xfail=no -( - $as_echo "7. $at_setup_line: testing $at_desc ..." - $at_traceon - - -{ set +x -$as_echo "$at_srcdir/t_application_help.at:32: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_empty" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_help.at:32" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_empty -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_help.at:32" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_help.at:33: grep 'Available options' stdout" -at_fn_check_prepare_trace "t_application_help.at:33" -( $at_check_trace; grep 'Available options' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_application_help.at:33" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_application_help.at:35: \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_app_empty -h" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_application_help.at:35" -( $at_check_trace; $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_app_empty -h -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_help.at:35" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_application_help.at:36: grep 'Available options' stdout" -at_fn_check_prepare_trace "t_application_help.at:36" -( $at_check_trace; grep 'Available options' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_application_help.at:36" -$at_failed && at_fn_log_failure -$at_traceon; } - - - set +x - $at_times_p && times >"$at_times_file" -) 5>&1 2>&1 7>&- | eval $at_tee_pipe -read at_status <"$at_status_file" -#AT_STOP_7 -#AT_START_8 -at_fn_group_banner 8 't_atf_config.at:30' \ - "atf-config: querying of build-time variables" " " -at_xfail=no -( - $as_echo "8. $at_setup_line: testing $at_desc ..." - $at_traceon - - - -all_vars="atf_arch \ - atf_build_cc \ - atf_build_cflags \ - atf_build_cpp \ - atf_build_cppflags \ - atf_build_cxx \ - atf_build_cxxflags \ - atf_confdir \ - atf_includedir \ - atf_libdir \ - atf_libexecdir \ - atf_machine \ - atf_pkgdatadir \ - atf_shell \ - atf_workdir" -all_vars_no=15 - -{ set +x -$as_echo "$at_srcdir/t_atf_config.at:51: atf-config" -at_fn_check_prepare_trace "t_atf_config.at:51" -( $at_check_trace; atf-config -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:51" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_config.at:52: test $(wc -l stdout | awk '{ print $1 }') = \${all_vars_no}" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:52" -( $at_check_trace; test $(wc -l stdout | awk '{ print $1 }') = ${all_vars_no} -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:52" -$at_failed && at_fn_log_failure -$at_traceon; } - -for v in ${all_vars}; do - { set +x -$as_echo "$at_srcdir/t_atf_config.at:54: grep \"\${v}\" stdout" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:54" -( $at_check_trace; grep "${v}" stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:54" -$at_failed && at_fn_log_failure -$at_traceon; } - -done - -for v in ${all_vars}; do - { set +x -$as_echo "$at_srcdir/t_atf_config.at:59: atf-config \${v}" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:59" -( $at_check_trace; atf-config ${v} -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:59" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:60: test $(wc -l stdout | awk '{ print $1 }') = 1" -at_fn_check_prepare_notrace 'a shell pipeline' "t_atf_config.at:60" -( $at_check_trace; test $(wc -l stdout | awk '{ print $1 }') = 1 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:60" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:61: grep \"\${v}\" stdout" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:61" -( $at_check_trace; grep "${v}" stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:61" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:62: cut -d ' ' -f 3- stdout" -at_fn_check_prepare_trace "t_atf_config.at:62" -( $at_check_trace; cut -d ' ' -f 3- stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:62" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:63: mv stdout expout" -at_fn_check_prepare_trace "t_atf_config.at:63" -( $at_check_trace; mv stdout expout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:63" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:64: atf-config -t \${v}" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:64" -( $at_check_trace; atf-config -t ${v} -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -$at_diff expout "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:64" -$at_failed && at_fn_log_failure -$at_traceon; } - -done - -{ set +x -$as_echo "$at_srcdir/t_atf_config.at:68: atf-config atf_libexecdir atf_pkgdatadir" -at_fn_check_prepare_trace "t_atf_config.at:68" -( $at_check_trace; atf-config atf_libexecdir atf_pkgdatadir -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:68" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_config.at:69: grep 'atf_libexecdir' stdout" -at_fn_check_prepare_trace "t_atf_config.at:69" -( $at_check_trace; grep 'atf_libexecdir' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:69" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_config.at:70: grep 'atf_pkgdatadir' stdout" -at_fn_check_prepare_trace "t_atf_config.at:70" -( $at_check_trace; grep 'atf_pkgdatadir' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:70" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_config.at:71: test $(wc -l stdout | awk '{ print $1 }') = 2" -at_fn_check_prepare_notrace 'a shell pipeline' "t_atf_config.at:71" -( $at_check_trace; test $(wc -l stdout | awk '{ print $1 }') = 2 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:71" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_config.at:74: atf-config non_existent" -at_fn_check_prepare_trace "t_atf_config.at:74" -( $at_check_trace; atf-config non_existent -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_config.at:74" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_config.at:75: grep 'Unknown variable.*non_existent' stderr" -at_fn_check_prepare_trace "t_atf_config.at:75" -( $at_check_trace; grep 'Unknown variable.*non_existent' stderr -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:75" -$at_failed && at_fn_log_failure -$at_traceon; } - - -for v in ${all_vars}; do - { set +x -$as_echo "$at_srcdir/t_atf_config.at:79: atf-config \${v} non_existent" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:79" -( $at_check_trace; atf-config ${v} non_existent -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_config.at:79" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:80: grep 'Unknown variable.*non_existent' stderr" -at_fn_check_prepare_trace "t_atf_config.at:80" -( $at_check_trace; grep 'Unknown variable.*non_existent' stderr -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:80" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:82: atf-config non_existent \${v}" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:82" -( $at_check_trace; atf-config non_existent ${v} -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_config.at:82" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:83: grep 'Unknown variable.*non_existent' stderr" -at_fn_check_prepare_trace "t_atf_config.at:83" -( $at_check_trace; grep 'Unknown variable.*non_existent' stderr -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:83" -$at_failed && at_fn_log_failure -$at_traceon; } - -done - -for v in ${all_vars}; do - V=$(echo ${v} | tr '[a-z]' '[A-Z]') - { set +x -$as_echo "$at_srcdir/t_atf_config.at:90: env \${V}=testval atf-config" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:90" -( $at_check_trace; env ${V}=testval atf-config -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:90" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:91: mv stdout all" -at_fn_check_prepare_trace "t_atf_config.at:91" -( $at_check_trace; mv stdout all -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:91" -$at_failed && at_fn_log_failure -$at_traceon; } - - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:93: grep \"^\${v} : \" all" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:93" -( $at_check_trace; grep "^${v} : " all -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:93" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:94: mv stdout affected" -at_fn_check_prepare_trace "t_atf_config.at:94" -( $at_check_trace; mv stdout affected -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:94" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:95: grep -v \"^\${v} : \" all" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:95" -( $at_check_trace; grep -v "^${v} : " all -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:95" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:96: mv stdout unaffected" -at_fn_check_prepare_trace "t_atf_config.at:96" -( $at_check_trace; mv stdout unaffected -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:96" -$at_failed && at_fn_log_failure -$at_traceon; } - - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:98: test $(wc -l affected | awk '{ print $1 }') = 1" -at_fn_check_prepare_notrace 'a shell pipeline' "t_atf_config.at:98" -( $at_check_trace; test $(wc -l affected | awk '{ print $1 }') = 1 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:98" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:99: test $(wc -l unaffected | awk '{ print $1 }') = \$((\${all_vars_no} - 1))" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_config.at:99" -( $at_check_trace; test $(wc -l unaffected | awk '{ print $1 }') = $((${all_vars_no} - 1)) -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:99" -$at_failed && at_fn_log_failure -$at_traceon; } - - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:102: grep \"^\${v} : testval\$\" affected" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "t_atf_config.at:102" -( $at_check_trace; grep "^${v} : testval$" affected -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_config.at:102" -$at_failed && at_fn_log_failure -$at_traceon; } - - { set +x -$as_echo "$at_srcdir/t_atf_config.at:103: grep ' : testval\$' unaffected" -at_fn_check_prepare_dynamic "grep ' : testval$' unaffected" "t_atf_config.at:103" -( $at_check_trace; grep ' : testval$' unaffected -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_config.at:103" -$at_failed && at_fn_log_failure -$at_traceon; } - -done - - set +x - $at_times_p && times >"$at_times_file" -) 5>&1 2>&1 7>&- | eval $at_tee_pipe -read at_status <"$at_status_file" -#AT_STOP_8 -#AT_START_9 -at_fn_group_banner 9 't_atf_run.at:30' \ - "atf-run: execution of tests" " " -at_xfail=no -( - $as_echo "9. $at_setup_line: testing $at_desc ..." - $at_traceon - - - - - - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:47: mkdir top" -at_fn_check_prepare_trace "t_atf_run.at:47" -( $at_check_trace; mkdir top -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:47" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:48: mkdir top/dir1" -at_fn_check_prepare_trace "t_atf_run.at:48" -( $at_check_trace; mkdir top/dir1 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:48" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:49: mkdir top/dir2" -at_fn_check_prepare_trace "t_atf_run.at:49" -( $at_check_trace; mkdir top/dir2 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:49" -$at_failed && at_fn_log_failure -$at_traceon; } - -cat >top/Atffile <<'_ATEOF' -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: dir1 -tp: dir2 -tp: test1 -tp: test2 -_ATEOF - -cat >top/dir1/Atffile <<'_ATEOF' -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: test3 -_ATEOF - -cat >top/dir2/Atffile <<'_ATEOF' -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: test4 -tp: test5 -_ATEOF - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:75: sed -e 's,@TC_NAME@,tc_1,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_pass" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:75" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_1,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_pass -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:75" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:75: mv stdout top/test1" -at_fn_check_prepare_trace "t_atf_run.at:75" -( $at_check_trace; mv stdout top/test1 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:75" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:75: chmod +x top/test1" -at_fn_check_prepare_trace "t_atf_run.at:75" -( $at_check_trace; chmod +x top/test1 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:75" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:76: sed -e 's,@TC_NAME@,tc_2,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_fail" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:76" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_2,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_fail -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:76" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:76: mv stdout top/test2" -at_fn_check_prepare_trace "t_atf_run.at:76" -( $at_check_trace; mv stdout top/test2 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:76" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:76: chmod +x top/test2" -at_fn_check_prepare_trace "t_atf_run.at:76" -( $at_check_trace; chmod +x top/test2 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:76" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:77: sed -e 's,@TC_NAME@,tc_3,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_pass" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:77" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_3,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_pass -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:77" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:77: mv stdout top/dir1/test3" -at_fn_check_prepare_trace "t_atf_run.at:77" -( $at_check_trace; mv stdout top/dir1/test3 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:77" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:77: chmod +x top/dir1/test3" -at_fn_check_prepare_trace "t_atf_run.at:77" -( $at_check_trace; chmod +x top/dir1/test3 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:77" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:78: sed -e 's,@TC_NAME@,tc_4,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_fail" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:78" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_4,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_fail -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:78" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:78: mv stdout top/dir2/test4" -at_fn_check_prepare_trace "t_atf_run.at:78" -( $at_check_trace; mv stdout top/dir2/test4 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:78" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:78: chmod +x top/dir2/test4" -at_fn_check_prepare_trace "t_atf_run.at:78" -( $at_check_trace; chmod +x top/dir2/test4 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:78" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:79: sed -e 's,@TC_NAME@,tc_5,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_pass" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:79" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_5,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_pass -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:79" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:79: mv stdout top/dir2/test5" -at_fn_check_prepare_trace "t_atf_run.at:79" -( $at_check_trace; mv stdout top/dir2/test5 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:79" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:79: chmod +x top/dir2/test5" -at_fn_check_prepare_trace "t_atf_run.at:79" -( $at_check_trace; chmod +x top/dir2/test5 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:79" -$at_failed && at_fn_log_failure -$at_traceon; } - - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:81: cd top/dir1 && atf-run" -at_fn_check_prepare_trace "t_atf_run.at:81" -( $at_check_trace; cd top/dir1 && atf-run -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:81" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:82: grep '^tc-end: [0-9. ]*, tc_3, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:82" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_3, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:82" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:83: grep -i 'tc_[1245]' stdout" -at_fn_check_prepare_trace "t_atf_run.at:83" -( $at_check_trace; grep -i 'tc_[1245]' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:83" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:84: grep 'tc-so:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:84" -( $at_check_trace; grep 'tc-so:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:84" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:85: grep 'tc-se:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:85" -( $at_check_trace; grep 'tc-se:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:85" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:87: cd top/dir2 && atf-run" -at_fn_check_prepare_trace "t_atf_run.at:87" -( $at_check_trace; cd top/dir2 && atf-run -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:87" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:88: grep '^tc-end: [0-9. ]*, tc_4, failed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:88" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_4, failed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:88" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:89: grep '^tc-end: [0-9. ]*, tc_5, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:89" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_5, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:89" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:90: grep -i 'tc_[123]' stdout" -at_fn_check_prepare_trace "t_atf_run.at:90" -( $at_check_trace; grep -i 'tc_[123]' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:90" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:91: grep 'tc-so:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:91" -( $at_check_trace; grep 'tc-so:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:91" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:92: grep 'tc-se:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:92" -( $at_check_trace; grep 'tc-se:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:92" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:94: cd top && atf-run" -at_fn_check_prepare_trace "t_atf_run.at:94" -( $at_check_trace; cd top && atf-run -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:94" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:95: grep '^tc-end: [0-9. ]*, tc_1, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:95" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_1, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:95" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:96: grep '^tc-end: [0-9. ]*, tc_2, failed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:96" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_2, failed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:96" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:97: grep '^tc-end: [0-9. ]*, tc_3, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:97" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_3, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:97" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:98: grep '^tc-end: [0-9. ]*, tc_4, failed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:98" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_4, failed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:98" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:99: grep '^tc-end: [0-9. ]*, tc_5, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:99" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_5, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:99" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:100: grep 'tc-so:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:100" -( $at_check_trace; grep 'tc-so:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:100" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:101: grep 'tc-se:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:101" -( $at_check_trace; grep 'tc-se:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:101" -$at_failed && at_fn_log_failure -$at_traceon; } - - -cat >top/Atffile <<'_ATEOF' -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: * -_ATEOF - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:111: cd top && atf-run" -at_fn_check_prepare_trace "t_atf_run.at:111" -( $at_check_trace; cd top && atf-run -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:111" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:112: grep '^tc-end: [0-9. ]*, tc_1, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:112" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_1, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:112" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:113: grep '^tc-end: [0-9. ]*, tc_2, failed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:113" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_2, failed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:113" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:114: grep '^tc-end: [0-9. ]*, tc_3, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:114" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_3, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:114" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:115: grep '^tc-end: [0-9. ]*, tc_4, failed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:115" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_4, failed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:115" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:116: grep '^tc-end: [0-9. ]*, tc_5, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:116" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_5, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:116" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:117: grep 'tc-so:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:117" -( $at_check_trace; grep 'tc-so:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:117" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:118: grep 'tc-se:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:118" -( $at_check_trace; grep 'tc-se:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:118" -$at_failed && at_fn_log_failure -$at_traceon; } - - -cat >top/Atffile <<'_ATEOF' -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: d* -_ATEOF - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:128: cd top && atf-run" -at_fn_check_prepare_trace "t_atf_run.at:128" -( $at_check_trace; cd top && atf-run -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:128" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:129: grep '^tc-end: [0-9. ]*, tc_3, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:129" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_3, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:129" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:130: grep '^tc-end: [0-9. ]*, tc_4, failed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:130" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_4, failed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:130" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:131: grep '^tc-end: [0-9. ]*, tc_5, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:131" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_5, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:131" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:132: grep 'tc-so:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:132" -( $at_check_trace; grep 'tc-so:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:132" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:133: grep 'tc-se:ignore-me' stdout" -at_fn_check_prepare_trace "t_atf_run.at:133" -( $at_check_trace; grep 'tc-se:ignore-me' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:133" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:138: rm -rf top" -at_fn_check_prepare_trace "t_atf_run.at:138" -( $at_check_trace; rm -rf top -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:138" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:139: mkdir top" -at_fn_check_prepare_trace "t_atf_run.at:139" -( $at_check_trace; mkdir top -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:139" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:140: sed -e 's,@TC_NAME@,tc_1,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_pass" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:140" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_1,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_pass -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:140" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:140: mv stdout top/test1" -at_fn_check_prepare_trace "t_atf_run.at:140" -( $at_check_trace; mv stdout top/test1 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:140" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:140: chmod +x top/test1" -at_fn_check_prepare_trace "t_atf_run.at:140" -( $at_check_trace; chmod +x top/test1 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:140" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:141: sed -e 's,@TC_NAME@,tc_2,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_pass" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:141" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_2,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_pass -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:141" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:141: mv stdout top/test2" -at_fn_check_prepare_trace "t_atf_run.at:141" -( $at_check_trace; mv stdout top/test2 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:141" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:141: chmod +x top/test2" -at_fn_check_prepare_trace "t_atf_run.at:141" -( $at_check_trace; chmod +x top/test2 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:141" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:142: sed -e 's,@TC_NAME@,tc_3,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_pass" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:142" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_3,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_pass -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:142" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:142: mv stdout top/test3" -at_fn_check_prepare_trace "t_atf_run.at:142" -( $at_check_trace; mv stdout top/test3 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:142" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:142: chmod +x top/test3" -at_fn_check_prepare_trace "t_atf_run.at:142" -( $at_check_trace; chmod +x top/test3 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:142" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:143: chmod -x top/test3" -at_fn_check_prepare_trace "t_atf_run.at:143" -( $at_check_trace; chmod -x top/test3 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:143" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:144: sed -e 's,@TC_NAME@,tc_4,g' <\$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_pass" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:144" -( $at_check_trace; sed -e 's,@TC_NAME@,tc_4,g' <$({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_pass -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:144" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:144: mv stdout top/.test4" -at_fn_check_prepare_trace "t_atf_run.at:144" -( $at_check_trace; mv stdout top/.test4 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:144" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:144: chmod +x top/.test4" -at_fn_check_prepare_trace "t_atf_run.at:144" -( $at_check_trace; chmod +x top/.test4 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:144" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:145: chmod -x top/.test4" -at_fn_check_prepare_trace "t_atf_run.at:145" -( $at_check_trace; chmod -x top/.test4 -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:145" -$at_failed && at_fn_log_failure -$at_traceon; } - -cat >top/Atffile <<'_ATEOF' -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp-glob: * -_ATEOF - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:153: cd top && atf-run" -at_fn_check_prepare_trace "t_atf_run.at:153" -( $at_check_trace; cd top && atf-run -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:153" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:154: grep '^tc-end: [0-9. ]*, tc_1, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:154" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_1, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:154" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:155: grep '^tc-end: [0-9. ]*, tc_2, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:155" -( $at_check_trace; grep '^tc-end: [0-9. ]*, tc_2, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:155" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:156: grep -i 'tc_3' stdout" -at_fn_check_prepare_trace "t_atf_run.at:156" -( $at_check_trace; grep -i 'tc_3' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:156" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:157: grep -i 'tc_4' stdout" -at_fn_check_prepare_trace "t_atf_run.at:157" -( $at_check_trace; grep -i 'tc_4' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:157" -$at_failed && at_fn_log_failure -$at_traceon; } - - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:160: rm -rf top" -at_fn_check_prepare_trace "t_atf_run.at:160" -( $at_check_trace; rm -rf top -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:160" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:161: mkdir top" -at_fn_check_prepare_trace "t_atf_run.at:161" -( $at_check_trace; mkdir top -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:161" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:162: cp \$({ - old=\$(pwd) - while test \$(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=\$(pwd) - cd \${old} - echo \${topdir} -})/bootstrap/h_tp_basic_sh top" -at_fn_check_prepare_notrace 'a $(...) command substitution' "t_atf_run.at:162" -( $at_check_trace; cp $({ - old=$(pwd) - while test $(pwd) != '/' -a ! -e ./Makefile; do - cd .. - done - topdir=$(pwd) - cd ${old} - echo ${topdir} -})/bootstrap/h_tp_basic_sh top -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:162" -$at_failed && at_fn_log_failure -$at_traceon; } - -cat >top/Atffile <<'_ATEOF' -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: h_tp_basic_sh -_ATEOF - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:170: cd top && atf-run" -at_fn_check_prepare_trace "t_atf_run.at:170" -( $at_check_trace; cd top && atf-run -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -echo stderr:; tee stderr <"$at_stderr" -echo stdout:; tee stdout <"$at_stdout" -at_fn_check_status 1 $at_status "$at_srcdir/t_atf_run.at:170" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:171: grep '^tc-end: [0-9. ]*, pass, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:171" -( $at_check_trace; grep '^tc-end: [0-9. ]*, pass, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:171" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:172: grep '^tc-end: [0-9. ]*, fail, failed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:172" -( $at_check_trace; grep '^tc-end: [0-9. ]*, fail, failed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:172" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:173: grep '^tc-end: [0-9. ]*, skip, skipped' stdout" -at_fn_check_prepare_trace "t_atf_run.at:173" -( $at_check_trace; grep '^tc-end: [0-9. ]*, skip, skipped' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:173" -$at_failed && at_fn_log_failure -$at_traceon; } - -{ set +x -$as_echo "$at_srcdir/t_atf_run.at:174: grep '^tc-end: [0-9. ]*, default, passed' stdout" -at_fn_check_prepare_trace "t_atf_run.at:174" -( $at_check_trace; grep '^tc-end: [0-9. ]*, default, passed' stdout -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo stdout:; cat "$at_stdout" -at_fn_check_status 0 $at_status "$at_srcdir/t_atf_run.at:174" -$at_failed && at_fn_log_failure -$at_traceon; } - - - set +x - $at_times_p && times >"$at_times_file" -) 5>&1 2>&1 7>&- | eval $at_tee_pipe -read at_status <"$at_status_file" -#AT_STOP_9 diff --git a/bootstrap/testsuite.at b/bootstrap/testsuite.at index 3536ac95b84d..31098f07fb32 100644 --- a/bootstrap/testsuite.at +++ b/bootstrap/testsuite.at @@ -74,11 +74,4 @@ m4_include(bootstrap/t_test_program_list.at) m4_include(bootstrap/t_test_program_compare.at) m4_include(bootstrap/t_subr_atf_check.at) -m4_if(ENABLE_TOOLS, yes, [ - m4_include(bootstrap/t_application_opts_args.at) - m4_include(bootstrap/t_application_help.at) - m4_include(bootstrap/t_atf_config.at) - m4_include(bootstrap/t_atf_run.at) -]) - dnl vim: syntax=m4:expandtab:shiftwidth=4:softtabstop=4 diff --git a/configure b/configure index 50333919d7ac..271b7ceca688 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Automated Testing Framework 0.19. +# Generated by GNU Autoconf 2.69 for Automated Testing Framework 0.20. # # Report bugs to . # @@ -592,8 +592,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Automated Testing Framework' PACKAGE_TARNAME='atf' -PACKAGE_VERSION='0.19' -PACKAGE_STRING='Automated Testing Framework 0.19' +PACKAGE_VERSION='0.20' +PACKAGE_STRING='Automated Testing Framework 0.20' PACKAGE_BUGREPORT='atf-devel@NetBSD.org' PACKAGE_URL='https://github.com/jmmv/atf/' @@ -642,19 +642,10 @@ GIT HAVE_KYUA_FALSE HAVE_KYUA_TRUE KYUA -GDB ATF_SHELL -atf_xsldir atf_pkgconfigdir -atf_egdir -atf_dtddir -atf_cssdir atf_aclocaldir ATF_WORKDIR -atf_confdir -ATF_CONFSUBDIR -atf_machine -atf_arch target_srcdir ATF_BUILD_CXXFLAGS ATF_BUILD_CXX @@ -672,9 +663,6 @@ CXXDEPMODE ac_ct_CXX CXXFLAGS CXX -ENABLE_TOOLS_FALSE -ENABLE_TOOLS_TRUE -ENABLE_TOOLS CPP OTOOL64 OTOOL @@ -803,7 +791,6 @@ enable_fast_install with_gnu_ld with_sysroot enable_libtool_lock -enable_tools enable_developer ' ac_precious_vars='build_alias @@ -825,7 +812,6 @@ ATF_BUILD_CPP ATF_BUILD_CPPFLAGS ATF_BUILD_CXX ATF_BUILD_CXXFLAGS -ATF_CONFSUBDIR ATF_WORKDIR ATF_SHELL' @@ -1368,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Automated Testing Framework 0.19 to adapt to many kinds of systems. +\`configure' configures Automated Testing Framework 0.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1439,7 +1425,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Automated Testing Framework 0.19:";; + short | recursive ) echo "Configuration of Automated Testing Framework 0.20:";; esac cat <<\_ACEOF @@ -1458,7 +1444,6 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-tools Enables the build of the deprecated ATF tools --enable-developer enable developer features Optional Packages: @@ -1494,8 +1479,6 @@ Some influential environment variables: C++ compiler to use at runtime ATF_BUILD_CXXFLAGS C++ compiler flags to use at runtime - ATF_CONFSUBDIR - Subdirectory of sysconfdir under which to look for files ATF_WORKDIR Default location to use for ATF work directories ATF_SHELL Location of the POSIX shell interpreter to use @@ -1566,7 +1549,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Automated Testing Framework configure 0.19 +Automated Testing Framework configure 0.20 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2072,65 +2055,11 @@ $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_func - -# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES -# --------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_cxx_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_cxx_check_type cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Automated Testing Framework $as_me 0.19, which was +It was created by Automated Testing Framework $as_me 0.20, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3116,7 +3045,7 @@ fi # Define the identity of the package. PACKAGE='atf' - VERSION='0.19' + VERSION='0.20' cat >>confdefs.h <<_ACEOF @@ -11931,27 +11860,6 @@ CC="$lt_save_CC" -# Check whether --enable-tools was given. -if test "${enable_tools+set}" = set; then : - enableval=$enable_tools; case $enableval in - yes|no) enable_tools=${enableval} ;; - *) as_fn_error $? "Invalid value passed to --enable-tools" "$LINENO" 5 ;; - esac -else - enable_tools=no -fi - -ENABLE_TOOLS=${enable_tools} - - if test "${enable_tools}" = yes; then - ENABLE_TOOLS_TRUE= - ENABLE_TOOLS_FALSE='#' -else - ENABLE_TOOLS_TRUE='#' - ENABLE_TOOLS_FALSE= -fi - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -17061,102 +16969,6 @@ $as_echo "#define HAVE_GETCWD_DYN 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the last valid signal" >&5 -$as_echo_n "checking for the last valid signal... " >&6; } -if ${kyua_cv_signal_lastno+:} false; then : - $as_echo_n "(cached) " >&6 -else - - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -#include -#include -int -main () -{ - - int i; - FILE *f; - - i = 0; - while (i < 1024) { - i++; - if (i != SIGKILL && i != SIGSTOP) { - struct sigaction sa; - int ret; - - sa.sa_handler = SIG_IGN; - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - - ret = sigaction(i, &sa, NULL); - if (ret == -1) { - if (errno == EINVAL) { - i--; - break; - } else - err(EXIT_FAILURE, "sigaction failed"); - } - } - } - if (i == 100) - errx(EXIT_FAILURE, "too much signals"); - - f = fopen("conftest.cnt", "w"); - if (f == NULL) - err(EXIT_FAILURE, "failed to open file"); - - fprintf(f, "%d\n", i); - fclose(f); - - return EXIT_SUCCESS; - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - if test ! -f conftest.cnt; then - kyua_cv_signal_lastno=15 - else - kyua_cv_signal_lastno=$(cat conftest.cnt) - rm -f conftest.cnt - fi -else - kyua_cv_signal_lastno=15 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kyua_cv_signal_lastno" >&5 -$as_echo "$kyua_cv_signal_lastno" >&6; } - -cat >>confdefs.h <<_ACEOF -#define LAST_SIGNO ${kyua_cv_signal_lastno} -_ACEOF - - - -ac_fn_cxx_check_type "$LINENO" "timer_t" "ac_cv_type_timer_t" "#include -" -if test "x$ac_cv_type_timer_t" = xyes; then : - -fi - - test x"${ATF_BUILD_CC-unset}" = x"unset" && ATF_BUILD_CC="${CC}" @@ -17197,37 +17009,6 @@ fi -atf_arch=`uname -p` -atf_machine=`uname -m` - -{ $as_echo "$as_me:${as_lineno-$LINENO}: Machine type: ${atf_machine}, architecture: ${atf_arch}" >&5 -$as_echo "$as_me: Machine type: ${atf_machine}, architecture: ${atf_arch}" >&6;} -atf_arch=${atf_arch} - -atf_machine=${atf_machine} - - - - -if test x"${ATF_CONFSUBDIR-unset}" = x"unset"; then - ATF_CONFSUBDIR=atf -else - case ${ATF_CONFSUBDIR} in - /*) - as_fn_error $? "ATF_CONFSUBDIR must hold a relative path" "$LINENO" 5 - ;; - *) - ;; - esac -fi -if test x"${ATF_CONFSUBDIR}" = x""; then - atf_confdir=\${sysconfdir} - -else - atf_confdir=\${sysconfdir}/${ATF_CONFSUBDIR} - -fi - if test x"${ATF_WORKDIR}" = x""; then for t in /tmp /var/tmp; do @@ -17251,16 +17032,8 @@ fi atf_aclocaldir=\${datadir}/aclocal -atf_cssdir=\${datadir}/examples/atf - -atf_dtddir=\${datadir}/xml/atf - -atf_egdir=\${datadir}/examples/atf - atf_pkgconfigdir=\${libdir}/pkgconfig -atf_xsldir=\${datadir}/xsl/atf - @@ -17324,46 +17097,6 @@ if test x"${ATF_SHELL}" = x""; then fi -# Extract the first word of "gdb", so it can be a program name with args. -set dummy gdb; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GDB+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GDB in - [\\/]* | ?:[\\/]*) - ac_cv_path_GDB="$GDB" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GDB="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GDB=$ac_cv_path_GDB -if test -n "$GDB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDB" >&5 -$as_echo "$GDB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of "kyua", so it can be a program name with args. set dummy kyua; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -17454,7 +17187,7 @@ fi -ac_config_files="$ac_config_files Makefile atf-c/defs.h tools/defs.hpp" +ac_config_files="$ac_config_files Makefile atf-c/defs.h" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -17589,10 +17322,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_TOOLS_TRUE}" && test -z "${ENABLE_TOOLS_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_TOOLS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18002,7 +17731,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Automated Testing Framework $as_me 0.19, which was +This file was extended by Automated Testing Framework $as_me 0.20, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18069,7 +17798,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Automated Testing Framework config.status 0.19 +Automated Testing Framework config.status 0.20 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18580,7 +18309,6 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "atf-c/defs.h") CONFIG_FILES="$CONFIG_FILES atf-c/defs.h" ;; - "tools/defs.hpp") CONFIG_FILES="$CONFIG_FILES tools/defs.hpp" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -20128,10 +19856,3 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -if test ${enable_tools} = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building the deprecated ATF tools (atf-run and atf-report);" >&5 -$as_echo "$as_me: WARNING: Building the deprecated ATF tools (atf-run and atf-report);" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please migrate to Kyua as soon as feasible." >&5 -$as_echo "$as_me: WARNING: please migrate to Kyua as soon as feasible." >&2;} -fi - diff --git a/configure.ac b/configure.ac index bca3184ab0e3..3a443c86ffaa 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ dnl ----------------------------------------------------------------------- dnl Initialize the GNU build system. dnl ----------------------------------------------------------------------- -AC_INIT([Automated Testing Framework], [0.19], [atf-devel@NetBSD.org], [atf], +AC_INIT([Automated Testing Framework], [0.20], [atf-devel@NetBSD.org], [atf], [https://github.com/jmmv/atf/]) AC_PREREQ([2.65]) AC_COPYRIGHT([Copyright (c) 2007-2012 The NetBSD Foundation, Inc.]) @@ -51,17 +51,6 @@ AM_INIT_AUTOMAKE([1.9 check-news foreign subdir-objects -Wall]) AM_PROG_AR LT_INIT -AC_ARG_ENABLE(tools, - AS_HELP_STRING([--enable-tools], - [Enables the build of the deprecated ATF tools]), - [case $enableval in - yes|no) enable_tools=${enableval} ;; - *) AC_MSG_ERROR([Invalid value passed to --enable-tools]) ;; - esac], - [enable_tools=no]) -AC_SUBST([ENABLE_TOOLS], ${enable_tools}) -AM_CONDITIONAL([ENABLE_TOOLS], [test "${enable_tools}" = yes]) - dnl ----------------------------------------------------------------------- dnl Check for the C and C++ compilers and required features. dnl ----------------------------------------------------------------------- @@ -91,9 +80,6 @@ ATF_MODULE_APPLICATION ATF_MODULE_DEFS ATF_MODULE_ENV ATF_MODULE_FS -ATF_MODULE_SIGNALS - -AC_CHECK_TYPE([timer_t], [], [], [[#include ]]) ATF_RUNTIME_TOOL([ATF_BUILD_CC], [C compiler to use at runtime], [${CC}]) @@ -122,40 +108,10 @@ else fi AC_SUBST([target_srcdir]) -dnl ----------------------------------------------------------------------- -dnl Architecture and machine checks. -dnl ----------------------------------------------------------------------- - -atf_arch=`uname -p` -atf_machine=`uname -m` - -AC_MSG_NOTICE([Machine type: ${atf_machine}, architecture: ${atf_arch}]) -AC_SUBST(atf_arch, ${atf_arch}) -AC_SUBST(atf_machine, ${atf_machine}) - dnl ----------------------------------------------------------------------- dnl User-customizable variables. dnl ----------------------------------------------------------------------- -AC_ARG_VAR([ATF_CONFSUBDIR], - [Subdirectory of sysconfdir under which to look for files]) -if test x"${ATF_CONFSUBDIR-unset}" = x"unset"; then - ATF_CONFSUBDIR=atf -else - case ${ATF_CONFSUBDIR} in - /*) - AC_MSG_ERROR([ATF_CONFSUBDIR must hold a relative path]) - ;; - *) - ;; - esac -fi -if test x"${ATF_CONFSUBDIR}" = x""; then - AC_SUBST(atf_confdir, \${sysconfdir}) -else - AC_SUBST(atf_confdir, \${sysconfdir}/${ATF_CONFSUBDIR}) -fi - AC_ARG_VAR([ATF_WORKDIR], [Default location to use for ATF work directories]) if test x"${ATF_WORKDIR}" = x""; then @@ -179,11 +135,7 @@ else fi AC_SUBST(atf_aclocaldir, \${datadir}/aclocal) -AC_SUBST(atf_cssdir, \${datadir}/examples/atf) -AC_SUBST(atf_dtddir, \${datadir}/xml/atf) -AC_SUBST(atf_egdir, \${datadir}/examples/atf) AC_SUBST(atf_pkgconfigdir, \${libdir}/pkgconfig) -AC_SUBST(atf_xsldir, \${datadir}/xsl/atf) dnl ----------------------------------------------------------------------- dnl Check for the shell and portability problems. @@ -209,7 +161,6 @@ dnl ----------------------------------------------------------------------- dnl Check for required tools. dnl ----------------------------------------------------------------------- -AC_PATH_PROG([GDB], [gdb]) AC_PATH_PROG([KYUA], [kyua]) AM_CONDITIONAL([HAVE_KYUA], [test -n "${KYUA}"]) AC_PATH_PROG([GIT], [git]) @@ -218,11 +169,6 @@ dnl ----------------------------------------------------------------------- dnl Finally, generate output. dnl ----------------------------------------------------------------------- -AC_OUTPUT([Makefile atf-c/defs.h tools/defs.hpp]) - -if test ${enable_tools} = yes; then - AC_MSG_WARN([Building the deprecated ATF tools (atf-run and atf-report);]) - AC_MSG_WARN([please migrate to Kyua as soon as feasible.]) -fi +AC_OUTPUT([Makefile atf-c/defs.h]) dnl vim: syntax=m4:expandtab:shiftwidth=4:softtabstop=4 diff --git a/m4/module-signals.m4 b/m4/module-signals.m4 deleted file mode 100644 index 6580eb6e1068..000000000000 --- a/m4/module-signals.m4 +++ /dev/null @@ -1,86 +0,0 @@ -dnl -dnl Automated Testing Framework (atf) -dnl -dnl Copyright (c) 2008 The NetBSD Foundation, Inc. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted provided that the following conditions -dnl are met: -dnl 1. Redistributions of source code must retain the above copyright -dnl notice, this list of conditions and the following disclaimer. -dnl 2. Redistributions in binary form must reproduce the above copyright -dnl notice, this list of conditions and the following disclaimer in the -dnl documentation and/or other materials provided with the distribution. -dnl -dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -dnl - -AC_DEFUN([ATF_MODULE_SIGNALS], [ - AC_CACHE_CHECK( - [for the last valid signal], - [kyua_cv_signal_lastno], [ - AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -#include -#include -#include -#include -#include ], [ - int i; - FILE *f; - - i = 0; - while (i < 1024) { - i++; - if (i != SIGKILL && i != SIGSTOP) { - struct sigaction sa; - int ret; - - sa.sa_handler = SIG_IGN; - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - - ret = sigaction(i, &sa, NULL); - if (ret == -1) { - if (errno == EINVAL) { - i--; - break; - } else - err(EXIT_FAILURE, "sigaction failed"); - } - } - } - if (i == 100) - errx(EXIT_FAILURE, "too much signals"); - - f = fopen("conftest.cnt", "w"); - if (f == NULL) - err(EXIT_FAILURE, "failed to open file"); - - fprintf(f, "%d\n", i); - fclose(f); - - return EXIT_SUCCESS; -])], - [if test ! -f conftest.cnt; then - kyua_cv_signal_lastno=15 - else - kyua_cv_signal_lastno=$(cat conftest.cnt) - rm -f conftest.cnt - fi], - [kyua_cv_signal_lastno=15]) - ]) - AC_DEFINE_UNQUOTED([LAST_SIGNO], [${kyua_cv_signal_lastno}], - [Define to the last valid signal number]) -]) diff --git a/test-programs/Atffile b/test-programs/Atffile deleted file mode 100644 index 6a67a8ffbdb8..000000000000 --- a/test-programs/Atffile +++ /dev/null @@ -1,9 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: config_test -tp: expect_test -tp: meta_data_test -tp: srcdir_test -tp: result_test diff --git a/test-programs/Makefile.am.inc b/test-programs/Makefile.am.inc index 9e8cdb5e21f3..56993a5fe092 100644 --- a/test-programs/Makefile.am.inc +++ b/test-programs/Makefile.am.inc @@ -27,8 +27,7 @@ # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -tests_test_programs_DATA = test-programs/Atffile \ - test-programs/Kyuafile +tests_test_programs_DATA = test-programs/Kyuafile tests_test_programsdir = $(pkgtestsdir)/test-programs EXTRA_DIST += $(tests_test_programs_DATA) diff --git a/tools/Atffile b/tools/Atffile deleted file mode 100644 index 8896078bcf97..000000000000 --- a/tools/Atffile +++ /dev/null @@ -1,25 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: atf-config_test -tp: atf-report_test -tp: atf-run_test -tp: application_test -tp: atffile_test -tp: auto_array_test -tp: config_test -tp: config_file_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 diff --git a/tools/Kyuafile b/tools/Kyuafile deleted file mode 100644 index 09c5145ff9eb..000000000000 --- a/tools/Kyuafile +++ /dev/null @@ -1,24 +0,0 @@ -syntax("kyuafile", 1) - -test_suite("atf") - -atf_test_program{name="atf-config_test"} -atf_test_program{name="atf-report_test"} -atf_test_program{name="atf-run_test"} -atf_test_program{name="application_test"} -atf_test_program{name="atffile_test"} -atf_test_program{name="auto_array_test"} -atf_test_program{name="config_test"} -atf_test_program{name="config_file_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"} diff --git a/tools/Makefile.am.inc b/tools/Makefile.am.inc deleted file mode 100644 index 26668bae6516..000000000000 --- a/tools/Makefile.am.inc +++ /dev/null @@ -1,332 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -TOOLS_CPPFLAGS = -I$(top_srcdir)/tools -I$(top_builddir)/tools -TOOLS_LDADD = tools/libtools.a - -noinst_LIBRARIES = tools/libtools.a -tools_libtools_a_SOURCES = tools/application.cpp \ - tools/application.hpp \ - tools/atffile.cpp \ - tools/atffile.hpp \ - tools/auto_array.hpp \ - tools/config.cpp \ - tools/config.hpp \ - tools/config_file.cpp \ - tools/config_file.hpp \ - tools/env.cpp \ - tools/env.hpp \ - tools/exceptions.cpp \ - tools/exceptions.hpp \ - tools/expand.cpp \ - tools/expand.hpp \ - tools/fs.cpp \ - tools/fs.hpp \ - tools/io.cpp \ - tools/io.hpp \ - tools/parser.cpp \ - tools/parser.hpp \ - tools/process.cpp \ - tools/process.hpp \ - tools/reader.cpp \ - tools/reader.hpp \ - tools/requirements.cpp \ - tools/requirements.hpp \ - tools/signals.cpp \ - tools/signals.hpp \ - tools/test-program.cpp \ - tools/test-program.hpp \ - tools/test_helpers.hpp \ - tools/text.cpp \ - tools/text.hpp \ - tools/timers.cpp \ - tools/timers.hpp \ - tools/ui.cpp \ - tools/ui.hpp \ - tools/user.cpp \ - tools/user.hpp -nodist_tools_libtools_a_SOURCES = tools/defs.hpp -tools_libtools_a_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \ - "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \ - "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \ - "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \ - "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \ - "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \ - "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \ - "-DATF_CONFDIR=\"$(atf_confdir)\"" \ - "-DATF_INCLUDEDIR=\"$(includedir)\"" \ - "-DATF_LIBDIR=\"$(libdir)\"" \ - "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \ - "-DATF_MACHINE=\"$(atf_machine)\"" \ - "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \ - "-DATF_SHELL=\"$(ATF_SHELL)\"" \ - "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \ - $(TOOLS_CPPFLAGS) - -# XXX For some reason, the nodist line above does not work as expected. -# Work this problem around. -DIST_HOOKS += kill-defs-hpp -kill-defs-hpp: - rm -f $(distdir)/tools/defs.hpp - - - -bin_PROGRAMS += tools/atf-config -tools_atf_config_SOURCES = tools/atf-config.cpp -tools_atf_config_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_atf_config_LDADD = $(TOOLS_LDADD) -dist_man_MANS += tools/atf-config.1 - -bin_PROGRAMS += tools/atf-report -tools_atf_report_SOURCES = tools/atf-report.cpp -tools_atf_report_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_atf_report_LDADD = $(TOOLS_LDADD) -dist_man_MANS += tools/atf-report.1 - -bin_PROGRAMS += tools/atf-run -tools_atf_run_CPPFLAGS = $(TOOLS_CPPFLAGS) "-DGDB=\"$(GDB)\"" -tools_atf_run_SOURCES = tools/atf-run.cpp -tools_atf_run_LDADD = $(TOOLS_LDADD) -dist_man_MANS += tools/atf-run.1 - -bin_PROGRAMS += tools/atf-version -tools_atf_version_SOURCES = tools/atf-version.cpp -nodist_tools_atf_version_SOURCES = tools/revision.h -tools_atf_version_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_atf_version_LDADD = $(TOOLS_LDADD) -dist_man_MANS += tools/atf-version.1 - -EXTRA_DIST += tools/generate-revision.sh - -BUILT_SOURCES += tools/revision.h -CLEANFILES += tools/revision.h -tools/revision.h: tools/revision.h.stamp - @test -d tools || mkdir -p tools - @cmp -s tools/revision.h tools/revision.h.stamp || \ - cp -p tools/revision.h.stamp tools/revision.h - -CLEANFILES += tools/revision.h.stamp -PHONY_TARGETS += tools/revision.h.stamp -tools/revision.h.stamp: - @test -d tools || mkdir -p tools - @$(top_srcdir)/tools/generate-revision.sh \ - -g "$(GIT)" -r $(top_srcdir) -o tools/revision.h.stamp \ - -v $(PACKAGE_VERSION) - - - -man_MANS += tools/atf.7 -CLEANFILES += tools/atf.7 -EXTRA_DIST += tools/atf.7.in - -dist_man_MANS += tools/atf-formats.5 - -tools/atf.7: $(srcdir)/tools/atf.7.in - test -d tools || mkdir -p tools - sed -e 's#__DOCDIR__#$(docdir)#g' \ - -e 's#__TESTSDIR__#$(testsdir)#g' \ - <$(srcdir)/tools/atf.7.in >tools/atf.7.tmp - mv tools/atf.7.tmp tools/atf.7 - - - -cssdir = $(atf_cssdir) -css_DATA = tools/tests-results.css -EXTRA_DIST += $(css_DATA) - -dtddir = $(atf_dtddir) -dtd_DATA = tools/tests-results.dtd -EXTRA_DIST += $(dtd_DATA) - -egdir = $(atf_egdir) -eg_DATA = tools/sample/atf-run.hooks -eg_DATA += tools/sample/common.conf -EXTRA_DIST += $(eg_DATA) - -hooksdir = $(pkgdatadir) -hooks_DATA = tools/share/atf-run.hooks -EXTRA_DIST += $(hooks_DATA) - -xsldir = $(atf_xsldir) -xsl_DATA = tools/tests-results.xsl -EXTRA_DIST += $(xsl_DATA) - - - -tests_tools_DATA = tools/Atffile tools/Kyuafile -tests_toolsdir = $(pkgtestsdir)/tools -EXTRA_DIST += $(tests_tools_DATA) - -tests_tools_SCRIPTS = tools/atf-config_test -CLEANFILES += tools/atf-config_test -EXTRA_DIST += tools/atf-config_test.sh -tools/atf-config_test: $(srcdir)/tools/atf-config_test.sh - @test -d tools || mkdir -p tools - @src="$(srcdir)/tools/atf-config_test.sh"; \ - dst="tools/atf-config_test"; $(BUILD_SH_TP) - -tests_tools_SCRIPTS += tools/atf-report_test -CLEANFILES += tools/atf-report_test -EXTRA_DIST += tools/atf-report_test.sh -tools/atf-report_test: $(srcdir)/tools/atf-report_test.sh - @test -d tools || mkdir -p tools - @src="$(srcdir)/tools/atf-report_test.sh"; \ - dst="tools/atf-report_test"; $(BUILD_SH_TP) - -tests_tools_SCRIPTS += tools/atf-run_test -CLEANFILES += tools/atf-run_test -EXTRA_DIST += tools/atf-run_test.sh -tools/atf-run_test: $(srcdir)/tools/atf-run_test.sh - @test -d tools || mkdir -p tools - @src="$(srcdir)/tools/atf-run_test.sh"; \ - dst="tools/atf-run_test"; $(BUILD_SH_TP) - -tests_tools_PROGRAMS = tools/application_test -tools_application_test_SOURCES = tools/application_test.cpp -tools_application_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_application_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/atffile_test -tools_atffile_test_SOURCES = tools/atffile_test.cpp -tools_atffile_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_atffile_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/auto_array_test -tools_auto_array_test_SOURCES = tools/auto_array_test.cpp -tools_auto_array_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_auto_array_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/bad_metadata_helper -tools_bad_metadata_helper_SOURCES = tools/bad_metadata_helper.c -tools_bad_metadata_helper_LDADD = libatf-c.la - -tests_tools_PROGRAMS += tools/config_test -tools_config_test_SOURCES = tools/config_test.cpp -tools_config_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_config_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/config_file_test -tools_config_file_test_SOURCES = tools/config_file_test.cpp -tools_config_file_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_config_file_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/env_test -tools_env_test_SOURCES = tools/env_test.cpp -tools_env_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_env_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/expand_test -tools_expand_test_SOURCES = tools/expand_test.cpp -tools_expand_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_expand_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/expect_helpers -tools_expect_helpers_SOURCES = tools/expect_helpers.c -tools_expect_helpers_LDADD = libatf-c.la - -tests_tools_PROGRAMS += tools/fail_helper -tools_fail_helper_SOURCES = tools/fail_helper.cpp -tools_fail_helper_LDADD = $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/fs_test -tools_fs_test_SOURCES = tools/fs_test.cpp -tools_fs_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_fs_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/io_test -tools_io_test_SOURCES = tools/io_test.cpp -tools_io_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_io_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/misc_helpers -tools_misc_helpers_SOURCES = tools/misc_helpers.cpp -tools_misc_helpers_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_misc_helpers_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/parser_test -tools_parser_test_SOURCES = tools/parser_test.cpp -tools_parser_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_parser_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/process_test -tools_process_test_SOURCES = tools/process_test.cpp -tools_process_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_process_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/pass_helper -tools_pass_helper_SOURCES = tools/pass_helper.cpp -tools_pass_helper_LDADD = $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/process_helpers -tools_process_helpers_SOURCES = tools/process_helpers.c - -tests_tools_PROGRAMS += tools/reader_test -tools_reader_test_SOURCES = tools/reader_test.cpp -tools_reader_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_reader_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/requirements_test -tools_requirements_test_SOURCES = tools/requirements_test.cpp -tools_requirements_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_requirements_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/several_tcs_helper -tools_several_tcs_helper_SOURCES = tools/several_tcs_helper.c -tools_several_tcs_helper_LDADD = libatf-c.la - -tests_tools_PROGRAMS += tools/signals_test -tools_signals_test_SOURCES = tools/signals_test.cpp tools/signals.cpp -tools_signals_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_signals_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/test_program_test -tools_test_program_test_SOURCES = tools/test_program_test.cpp -tools_test_program_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_test_program_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/text_test -tools_text_test_SOURCES = tools/text_test.cpp tools/text.cpp -tools_text_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_text_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/ui_test -tools_ui_test_SOURCES = tools/ui_test.cpp tools/ui.cpp -tools_ui_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_ui_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/user_test -tools_user_test_SOURCES = tools/user_test.cpp tools/user.cpp -tools_user_test_CPPFLAGS = $(TOOLS_CPPFLAGS) -tools_user_test_LDADD = $(TOOLS_LDADD) $(ATF_CXX_LIBS) - -tests_tools_PROGRAMS += tools/zero_tcs_helper -tools_zero_tcs_helper_SOURCES = tools/zero_tcs_helper.c -tools_zero_tcs_helper_LDADD = libatf-c.la - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/tools/application.cpp b/tools/application.cpp deleted file mode 100644 index 723e9f185640..000000000000 --- a/tools/application.cpp +++ /dev/null @@ -1,317 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(HAVE_CONFIG_H) -#include "bconfig.h" -#endif - -extern "C" { -#include -} - -#include -#include -#include -#include -#include -#include - -#include "application.hpp" -#include "defs.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" - -// ------------------------------------------------------------------------ -// The "usage_error" class. -// ------------------------------------------------------------------------ - -impl::usage_error::usage_error(const char *fmt, ...) - throw() : - std::runtime_error("usage_error; message unformatted") -{ - va_list ap; - - va_start(ap, fmt); - std::vsnprintf(m_text, sizeof(m_text), fmt, ap); - va_end(ap); -} - -impl::usage_error::~usage_error(void) - throw() -{ -} - -const char* -impl::usage_error::what(void) - const throw() -{ - return m_text; -} - -// ------------------------------------------------------------------------ -// The "application" class. -// ------------------------------------------------------------------------ - -impl::option::option(char ch, - const std::string& a, - const std::string& desc) : - m_character(ch), - m_argument(a), - m_description(desc) -{ -} - -bool -impl::option::operator<(const impl::option& o) - const -{ - return m_character < o.m_character; -} - -impl::app::app(const std::string& description, - const std::string& manpage, - const std::string& global_manpage) : - m_hflag(false), - m_argc(-1), - m_argv(NULL), - m_prog_name(NULL), - m_description(description), - m_manpage(manpage), - m_global_manpage(global_manpage) -{ -} - -impl::app::~app(void) -{ -} - -bool -impl::app::inited(void) -{ - return m_argc != -1; -} - -impl::app::options_set -impl::app::options(void) -{ - options_set opts = specific_options(); - opts.insert(option('h', "", "Shows this help message")); - return opts; -} - -std::string -impl::app::specific_args(void) - const -{ - return ""; -} - -impl::app::options_set -impl::app::specific_options(void) - const -{ - return options_set(); -} - -void -impl::app::process_option(int ch ATF_DEFS_ATTRIBUTE_UNUSED, - const char* arg ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::app::process_options(void) -{ - assert(inited()); - - std::string optstr; -#if defined(HAVE_GNU_GETOPT) - optstr += '+'; // Turn on POSIX behavior. -#endif - optstr += ':'; - { - options_set opts = options(); - for (options_set::const_iterator iter = opts.begin(); - iter != opts.end(); iter++) { - const option& opt = (*iter); - - optstr += opt.m_character; - if (!opt.m_argument.empty()) - optstr += ':'; - } - } - - int ch; - const int old_opterr = ::opterr; - ::opterr = 0; - while ((ch = ::getopt(m_argc, m_argv, optstr.c_str())) != -1) { - switch (ch) { - case 'h': - m_hflag = true; - break; - - case ':': - throw usage_error("Option -%c requires an argument.", - ::optopt); - - case '?': - throw usage_error("Unknown option -%c.", ::optopt); - - default: - process_option(ch, ::optarg); - } - } - m_argc -= ::optind; - m_argv += ::optind; - - // 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 -impl::app::usage(std::ostream& os) -{ - assert(inited()); - - std::string args = specific_args(); - if (!args.empty()) - args = " " + args; - os << ui::format_text_with_tag(std::string(m_prog_name) + " [options]" + - args, "Usage: ", false) << "\n\n" - << ui::format_text(m_description) << "\n\n"; - - options_set opts = options(); - assert(!opts.empty()); - os << "Available options:\n"; - size_t coldesc = 0; - for (options_set::const_iterator iter = opts.begin(); - iter != opts.end(); iter++) { - const option& opt = (*iter); - - if (opt.m_argument.length() + 1 > coldesc) - coldesc = opt.m_argument.length() + 1; - } - for (options_set::const_iterator iter = opts.begin(); - iter != opts.end(); iter++) { - const option& opt = (*iter); - - std::string tag = std::string(" -") + opt.m_character; - if (opt.m_argument.empty()) - tag += " "; - else - tag += " " + opt.m_argument + " "; - os << ui::format_text_with_tag(opt.m_description, tag, false, - coldesc + 10) << "\n"; - } - os << "\n"; - - std::string gmp; - if (!m_global_manpage.empty()) - gmp = " and " + m_global_manpage; - os << ui::format_text("For more details please see " + m_manpage + - gmp + ".") - << "\n"; -} - -int -impl::app::run(int argc, char* const* argv) -{ - assert(argc > 0); - assert(argv != NULL); - - m_argc = argc; - m_argv = argv; - - m_argv0 = m_argv[0]; - - m_prog_name = std::strrchr(m_argv[0], '/'); - if (m_prog_name == NULL) - m_prog_name = m_argv[0]; - else - m_prog_name++; - - // Libtool workaround: if running from within the source tree (binaries - // that are not installed yet), skip the "lt-" prefix added to files in - // the ".libs" directory to show the real (not temporary) name. - if (std::strncmp(m_prog_name, "lt-", 3) == 0) - m_prog_name += 3; - - 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."; - - int errcode; - try { - int oldargc = m_argc; - - process_options(); - - if (m_hflag) { - if (oldargc != 2) - throw usage_error("-h must be given alone."); - - usage(std::cout); - errcode = EXIT_SUCCESS; - } else - errcode = main(); - } catch (const usage_error& e) { - std::cerr << ui::format_error(m_prog_name, e.what()) << "\n" - << ui::format_info(m_prog_name, std::string("Type `") + - m_prog_name + " -h' for more details.") - << "\n"; - errcode = EXIT_FAILURE; - } catch (const std::runtime_error& e) { - std::cerr << ui::format_error(m_prog_name, std::string(e.what())) - << "\n"; - errcode = EXIT_FAILURE; - } catch (const std::exception& e) { - std::cerr << ui::format_error(m_prog_name, std::string("Caught " - "unexpected error: ") + e.what() + "\n" + bug) << "\n"; - errcode = EXIT_FAILURE; - } catch (...) { - std::cerr << ui::format_error(m_prog_name, std::string("Caught " - "unknown error\n") + bug) << "\n"; - errcode = EXIT_FAILURE; - } - return errcode; -} diff --git a/tools/application.hpp b/tools/application.hpp deleted file mode 100644 index 5a8d57c6e562..000000000000 --- a/tools/application.hpp +++ /dev/null @@ -1,113 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_APPLICATION_HPP) -#define TOOLS_APPLICATION_HPP - -#include -#include -#include -#include - -namespace tools { -namespace application { - -// ------------------------------------------------------------------------ -// The "usage_error" class. -// ------------------------------------------------------------------------ - -class usage_error : public std::runtime_error { - char m_text[4096]; - -public: - usage_error(const char*, ...) throw(); - ~usage_error(void) throw(); - - const char* what(void) const throw(); -}; - -// ------------------------------------------------------------------------ -// The "option" class. -// ------------------------------------------------------------------------ - -class option { - char m_character; - std::string m_argument; - std::string m_description; - - friend class app; - -public: - option(char, const std::string&, const std::string&); - - bool operator<(const option&) const; -}; - -// ------------------------------------------------------------------------ -// The "app" class. -// ------------------------------------------------------------------------ - -class app { - bool m_hflag; - - void process_options(void); - void usage(std::ostream&); - - bool inited(void); - -protected: - typedef std::set< option > options_set; - - int m_argc; - char* const* m_argv; - - const char* m_argv0; - const char* m_prog_name; - std::string m_description; - std::string m_manpage, m_global_manpage; - - options_set options(void); - - // To be redefined. - virtual std::string specific_args(void) const; - virtual options_set specific_options(void) const; - virtual void process_option(int, const char*); - virtual int main(void) = 0; - -public: - app(const std::string&, const std::string&, const std::string&); - virtual ~app(void); - - int run(int, char* const*); -}; - -} // namespace application -} // namespace tools - -#endif // !defined(TOOLS_APPLICATION_HPP) diff --git a/tools/application_test.cpp b/tools/application_test.cpp deleted file mode 100644 index a9013cdc6be0..000000000000 --- a/tools/application_test.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2009 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -} - -#include - -#include "application.hpp" - -class getopt_app : public tools::application::app { -public: - getopt_app(void) : app("description", "manpage", "other") {} - - int main(void) - { - // Provide an option that is unknown to the application driver and - // one that is, together with an argument that would be swallowed by - // the test program option if it were recognized. - int argc = 4; - char arg1[] = "progname"; - char arg2[] = "-Z"; - char arg3[] = "-s"; - char arg4[] = "foo"; - char *const argv[] = { arg1, arg2, arg3, arg4, NULL }; - - int ch; - bool zflag; - - // Given that this obviously is an application, and that we used the - // same driver to start, we can test getopt(3) right here without doing - // any fancy stuff. - zflag = false; - while ((ch = ::getopt(argc, argv, ":Z")) != -1) { - switch (ch) { - case 'Z': - zflag = true; - break; - - case '?': - default: - if (optopt != 's') - ATF_FAIL("Unexpected unknown option found"); - } - } - - ATF_REQUIRE(zflag); - ATF_REQUIRE_EQ(1, argc - optind); - ATF_REQUIRE_EQ(std::string("foo"), argv[optind]); - - return 0; - } -}; - -ATF_TEST_CASE_WITHOUT_HEAD(getopt); -ATF_TEST_CASE_BODY(getopt) -{ - int argc = 1; - char arg1[] = "progname"; - char *const argv[] = { arg1, NULL }; - ATF_REQUIRE_EQ(0, getopt_app().run(argc, argv)); -} - -ATF_INIT_TEST_CASES(tcs) -{ - ATF_ADD_TEST_CASE(tcs, getopt); -} diff --git a/tools/atf-config.1 b/tools/atf-config.1 deleted file mode 100644 index deae6f6406cb..000000000000 --- a/tools/atf-config.1 +++ /dev/null @@ -1,184 +0,0 @@ -.\" -.\" Automated Testing Framework (atf) -.\" -.\" Copyright (c) 2007 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd March 14, 2009 -.Dt ATF-CONFIG 1 -.Os -.Sh NAME -.Nm atf-config -.Nd queries static configuration information of ATF -.Sh SYNOPSIS -.Nm -.Op Fl t -.Op Ar var1 Op Ar .. varN -.Nm -.Fl h -.Sh DESCRIPTION -.Nm -is a utility that queries static configuration information of ATF. -Static configuration refers to all those values for settings that -were built into the ATF binaries at build time. -.Pp -In the first synopsis form, -.Nm -will print variable-value pairs for all built-in static variables if -no variable names are provided as arguments. -If any is provided, it will only print the variable-value pairs for -those variables. -The output of the utility does not use the -.Sq = -symbol to separate the variable name from its corresponding value in -an attempt to avoid sourcing the output in shell scripts or Makefiles. -If you need to do that, the -.Fl t -flag allows you to query the value of individual variables without any -surrounding text. -.Pp -In the second synopsis form, -.Nm -will print information about all supported options and their purpose. -.Pp -The following options are available: -.Bl -tag -width flag -.It Fl h -Shows a short summary of all available options and their purpose. -.It Fl t -Changes the output of the utility to show the variable values, one -per line, without the variable names. -.El -.Ss Static configuration variables -The following list describes all the variables that are part of ATF's -static configuration: -.Bl -tag -width atfXbuildXcppflagsXX -.It Va atf_arch -The architecture name detected by ATF. -This is derived from -.Va atf_machine -because it is a subset of it. -Given that this name might be misdetected, it is provided to the user -as a configuration variable so that he can fix its value temporarily -until a real fix is incorporated into mainstream sources. -.It Va atf_build_cc -The C compiler used by the ATF checks that provide build-time tests. -.It Va atf_build_cflags -The C compiler flags used by the ATF checks that provide build-time tests. -.It Va atf_build_cpp -The C/C++ preprocessor used by the ATF checks that provide build-time tests. -.It Va atf_build_cppflags -The C/C++ preprocessor flags used by the ATF checks that provide build-time -tests. -.It Va atf_build_cxx -The C++ compiler used by the ATF checks that provide build-time tests. -.It Va atf_build_cxxflags -The C++ compiler flags used by the ATF checks that provide build-time tests. -.It Va atf_confdir -The path to the directory that contains the system-wide configuration -files for ATF. -.It Va atf_includedir -The path to the directory that contains the ATF header files. -.It Va atf_libdir -The path to the directory that contains the ATF libraries. -.It Va atf_libexecdir -The path to the directory that contains the auxiliary utilities of ATF, -used internally by the public tools. -.It Va atf_machine -The machine type name detected by ATF. -This should not be tunable but is provided for symmetry with -.Va atf_arch . -.It Va atf_pkgdatadir -The path to the directory that contains the files that form the ATF's -shell-scripting library. -.It Va atf_shell -The path to the shell interpreter that will be used by ATF. -.It Va atf_workdir -The path to the temporary directory that the utilities and the test -programs will use to store temporary files in. -.El -.Sh ENVIRONMENT -Every variable that is part of the static configuration can be -overridden at run-time by defining an environment variable. -This environment variable has the exact same name as the one shown by -.Nm -except that the name is all composed of uppercase letters. -.Pp -In general, empty values in the environment will be ignored unless -otherwise noted below. -.Pp -The recognized environment variables are: -.Bl -tag -width ATFXBUILDXCPPFLAGSXX -.It Ev ATF_ARCH -Overrides the built-in value of -.Va atf_arch . -.It Ev ATF_BUILD_CC -Overrides the built-in value of -.Va atf_build_cc . -.It Ev ATF_BUILD_CFLAGS -Overrides the built-in value of -.Va atf_build_cflags . -Empty values are allowed. -.It Ev ATF_BUILD_CPP -Overrides the built-in value of -.Va atf_build_cpp . -.It Ev ATF_BUILD_CPPFLAGS -Overrides the built-in value of -.Va atf_build_cppflags . -Empty values are allowed. -.It Ev ATF_BUILD_CXX -Overrides the built-in value of -.Va atf_build_cxx . -.It Ev ATF_BUILD_CXXFLAGS -Overrides the built-in value of -.Va atf_build_cxxflags . -Empty values are allowed. -.It Ev ATF_CONFDIR -Overrides the built-in value of -.Va atf_confdir . -.It Ev ATF_INCLUDEDIR -Overrides the built-in value of -.Va atf_includedir . -.It Ev ATF_LIBDIR -Overrides the built-in value of -.Va atf_libdir . -.It Ev ATF_LIBEXECDIR -Overrides the built-in value of -.Va atf_libexecdir . -.It Ev ATF_MACHINE -Overrides the built-in value of -.Va atf_machine . -.It Ev ATF_PKGDATADIR -Overrides the built-in value of -.Va atf_pkgdatadir . -.It Ev ATF_SHELL -Overrides the built-in value of -.Va atf_shell . -.It Ev ATF_WORKDIR -Overrides the built-in value of -.Va atf_workdir . -.El -.Sh SEE ALSO -.Xr atf 7 diff --git a/tools/atf-config.cpp b/tools/atf-config.cpp deleted file mode 100644 index 4d82d55e636b..000000000000 --- a/tools/atf-config.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include -#include -#include - -#include "application.hpp" -#include "config.hpp" -#include "defs.hpp" - -class atf_config : public tools::application::app { - static const char* m_description; - - bool m_tflag; - - void process_option(int, const char*); - std::string specific_args(void) const; - options_set specific_options(void) const; - - std::string format_var(const std::string&, const std::string&); - -public: - atf_config(void); - - int main(void); -}; - -const char* atf_config::m_description = - "atf-config is a tool that queries the value of several " - "installation-specific configuration values of the atf. " - "It can be used by external tools to discover where specific " - "internal atf files are installed."; - -atf_config::atf_config(void) : - app(m_description, "atf-config(1)", "atf(7)"), - m_tflag(false) -{ -} - -void -atf_config::process_option(int ch, const char* arg ATF_DEFS_ATTRIBUTE_UNUSED) -{ - switch (ch) { - case 't': - m_tflag = true; - break; - - default: - std::abort(); - } -} - -std::string -atf_config::specific_args(void) - const -{ - return "[var1 [.. varN]]"; -} - -atf_config::options_set -atf_config::specific_options(void) - const -{ - using tools::application::option; - options_set opts; - opts.insert(option('t', "", "Terse output: show values only")); - return opts; -} - -std::string -atf_config::format_var(const std::string& name, const std::string& val) -{ - std::string str; - - if (m_tflag) - str = val; - else - str = name + " : " + val; - - return str; -} - -int -atf_config::main(void) -{ - if (m_argc < 1) { - std::map< std::string, std::string > cv = tools::config::get_all(); - - for (std::map< std::string, std::string >::const_iterator iter = - cv.begin(); iter != cv.end(); iter++) - std::cout << format_var((*iter).first, (*iter).second) << "\n"; - } else { - for (int i = 0; i < m_argc; i++) { - if (!tools::config::has(m_argv[i])) - throw std::runtime_error(std::string("Unknown variable `") + - m_argv[i] + "'"); - } - - for (int i = 0; i < m_argc; i++) { - std::cout << format_var(m_argv[i], tools::config::get(m_argv[i])) - << "\n"; - } - } - - return EXIT_SUCCESS; -} - -int -main(int argc, char* const* argv) -{ - return atf_config().run(argc, argv); -} diff --git a/tools/atf-config_test.sh b/tools/atf-config_test.sh deleted file mode 100755 index 5d6505a4176e..000000000000 --- a/tools/atf-config_test.sh +++ /dev/null @@ -1,180 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -all_vars="atf_arch \ - atf_build_cc \ - atf_build_cflags \ - atf_build_cpp \ - atf_build_cppflags \ - atf_build_cxx \ - atf_build_cxxflags \ - atf_confdir \ - atf_includedir \ - atf_libdir \ - atf_libexecdir \ - atf_machine \ - atf_pkgdatadir \ - atf_shell \ - atf_workdir" -all_vars_no=15 - -atf_test_case list_all -list_all_head() -{ - atf_set "descr" "Tests that at atf-config prints all expected" \ - "variables, and not more" -} -list_all_body() -{ - atf_check -s eq:0 -o save:stdout -e empty atf-config - atf_check -s eq:0 -o empty -e empty \ - test "$(wc -l stdout | awk '{ print $1 }')" = "${all_vars_no}" - for v in ${all_vars}; do - atf_check -s eq:0 -o ignore -e empty grep "${v}" stdout - done -} - -atf_test_case query_one -query_one_head() -{ - atf_set "descr" "Tests that querying a single variable works" -} -query_one_body() -{ - for v in ${all_vars}; do - atf_check -s eq:0 -o save:stdout -o match:"${v}" -e empty \ - atf-config "${v}" - atf_check -s eq:0 -o empty -e empty \ - test "$(wc -l stdout | awk '{ print $1 }')" = 1 - done -} - -atf_test_case query_one_terse -query_one_terse_head() -{ - atf_set "descr" "Tests that querying a single variable in terse mode" \ - "works" -} -query_one_terse_body() -{ - for v in ${all_vars}; do - atf_check -s eq:0 -o save:stdout -o match:"${v}" -e empty \ - atf-config "${v}" - atf_check -s eq:0 -o empty -e empty \ - test "$(wc -l stdout | awk '{ print $1 }')" = 1 - atf_check -s eq:0 -o save:stdout -e empty cut -d ' ' -f 3- stdout - atf_check -s eq:0 -o empty -e empty mv stdout expout - atf_check -s eq:0 -o file:expout -e empty atf-config -t "${v}" - done -} - -atf_test_case query_multiple -query_multiple_head() -{ - atf_set "descr" "Tests that querying multiple variables works" -} -query_multiple_body() -{ - atf_check -s eq:0 -o save:stdout -o match:'atf_libexecdir' \ - -o match:'atf_shell' -e empty atf-config atf_libexecdir atf_shell - atf_check -s eq:0 -o empty -e empty \ - test "$(wc -l stdout | awk '{ print $1 }')" = 2 -} - -atf_test_case query_unknown -query_unknown_head() -{ - atf_set "descr" "Tests that querying an unknown variable delivers" \ - "the correct error" -} -query_unknown_body() -{ - atf_check -s eq:1 -o empty -e match:'Unknown variable.*non_existent' \ - atf-config non_existent -} - -atf_test_case query_mixture -query_mixture_head() -{ - atf_set "descr" "Tests that querying a known and an unknown variable" \ - "delivers the correct error" -} -query_mixture_body() -{ - for v in ${all_vars}; do - atf_check -s eq:1 -o empty -e match:'Unknown variable.*non_existent' \ - atf-config "${v}" non_existent - atf_check -s eq:1 -o empty -e match:'Unknown variable.*non_existent' \ - atf-config non_existent "${v}" - done -} - -atf_test_case override_env -override_env_head() -{ - atf_set "descr" "Tests that build-time variables can be overriden" \ - "through their corresponding environment variables" -} -override_env_body() -{ - for v in ${all_vars}; do - V=$(echo ${v} | tr '[a-z]' '[A-Z]') - atf_check -s eq:0 -o save:stdout -e empty -x "${V}=testval atf-config" - atf_check -s eq:0 -o empty -e empty mv stdout all - - atf_check -s eq:0 -o save:stdout -e empty grep "^${v} : " all - atf_check -s eq:0 -o empty -e empty mv stdout affected - atf_check -s eq:0 -o save:stdout -e empty grep -v "^${v} : " all - atf_check -s eq:0 -o empty -e empty mv stdout unaffected - - atf_check -s eq:0 -o empty -e empty \ - test "$(wc -l affected | awk '{ print $1 }')" = 1 - atf_check -s eq:0 -o empty -e empty \ - test "$(wc -l unaffected | awk '{ print $1 }')" = \ - "$((${all_vars_no} -1))" - - atf_check -s eq:0 -o ignore -e empty grep "^${v} : testval$" affected - atf_check -s eq:1 -o empty -e empty grep ' : testval$' unaffected - done -} - -atf_init_test_cases() -{ - atf_add_test_case list_all - - atf_add_test_case query_one - atf_add_test_case query_one_terse - atf_add_test_case query_multiple - atf_add_test_case query_unknown - atf_add_test_case query_mixture - - atf_add_test_case override_env -} - -# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 diff --git a/tools/atf-formats.5 b/tools/atf-formats.5 deleted file mode 100644 index bb919f483a9c..000000000000 --- a/tools/atf-formats.5 +++ /dev/null @@ -1,231 +0,0 @@ -.\" -.\" Automated Testing Framework (atf) -.\" -.\" Copyright (c) 2007 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd December 20, 2011 -.Dt ATF-FORMATS 5 -.Os -.Sh NAME -.Nm atf-formats -.Nd machine-parseable data formats used by ATF -.Sh DESCRIPTION -This manual page describes the multiple data formats used in ATF. -These formats affect configuration files, control files and any data that -is externalized or internalized by the tools. -.Pp -Data files are always organized as follows: -.Bd -literal -offset indent -Header1: Value1 \\ - ... | head -HeaderN: ValueN / - mandatory blank line -Free-form text contents \\ - ... | body - ... / -.Ed -.Pp -A file must always contain a -.Sq Content-Type -header and must always separate that header from the body with a blank -line, even if the body is empty. -.Pp -The -.Sq Content-Type -is always of the form: -.Bd -literal -offset indent -Content-Type: application/X-atf-; version="" -.Ed -.Pp -where -.Sq subtype -indicates the specific file format and -.Sq version -its format version. -This header must be the first one of the file. -.Pp -The main purpose of the -.Sq Content-Type -header, aside from determining the format used in the file, is to allow -future changes to a given format. -Whenever an incompatible change is made, the version is bumped by one. -By keeping the header in the first line, future versions may even remove -the need for such a header -- e.g. if some format was replaced by XML -files, which have their own mandatory header. -.Pp -The rest of this document details the different format types. -.Ss Format: application/X-atf-atffile, version: 1 -Atffiles are logically divided into three sections: -.Bl -bullet -.It -Test programs: the list of test programs that define the test suite -described by the Atffile. -.It -Meta-data properties: these define some constant values applicable to -all the test programs defined in the file. -In some sense they define the properties that describe the test suite. -.It -Configuration variables: defaults for configuration variables that -can be overridden through configuration files or the command line. -.El -.Pp -The grammar for Atffiles is the following: -.Bd -literal -offset indent -DATA ::= ( ( CONF | PROP | TP )? COMMENT? NEWLINE )* EOF -CONF ::= 'conf:' WORD EQUAL STRING -PROP ::= 'prop:' WORD EQUAL STRING -TP ::= TPFILE | TPGLOB -TPFILE ::= 'tp: ' STRING -TPGLOB ::= 'tp-glob: ' STRING -STRING ::= WORD | '"' WORD* '"' -.Ed -.Pp -The meaning of the constructions above is: -.Bl -tag -width TPGLOBXX -.It CONF -Definition of a configuration variable. -.It PROP -Definition of a meta-data property. -.It TPFILE -Addition of a test program into the test suite. -The string is taken literally as the program's name, and this program -must exist. -.It TPGLOB -Addition of multiple test programs into the test suite. -The string is taken as a glob pattern, which may have or not have any -matches in the current directory. -.El -.Pp -An example: -.Bd -literal -offset indent -prop: test-suite = utilities - -conf: unprivileged-user = nobody - -tp: t_cp -tp: t_mv -tp: t_df -tp-glob: t_dir_* -.Ed -.Ss Format: application/X-atf-config, version: 1 -Configuration files are very simple: they only contain a list of variable -name/variable value pairs. -Their grammar is: -.Bd -literal -offset indent -DATA ::= ( VAR? COMMENT? NEWLINE )* EOF -VAR ::= WORD EQUAL STRING -COMMENT ::= HASH WORD* -STRING ::= WORD | '"' WORD* '"' -.Ed -.Pp -An example: -.Bd -literal -offset indent -# This is the system-wide configuration file for ATF. -# The above and this line are comments placed on their own line. - -var1 = this is a variable value -var2 = this is another one # Optional comment at the end. -.Ed -.Ss Format: application/X-atf-tps, version: 3 -The -.Sq application/X-atf-tps -format multiplexes the standard output, standard error and results output -streams from multiple test programs into a single data file. -This format is used by -.Xr atf-run 1 -to report the execution of several test programs and is later parsed by -.Xr atf-report 1 -to inform the user of this process. -It has the following grammar: -.Bd -literal -offset indent -DATA ::= INFO* TPS-COUNT TP-STANZA* INFO* EOF -INFO ::= 'info' COLON STRING COMMA STRING NEWLINE -TPS-COUNT ::= 'tps-count' COLON POSITIVE-NUMBER NEWLINE -TP-STANZA ::= TP-START TC-STANZA* TC-END -TP-START ::= 'tp-start' COLON TIMESTAMP COMMA STRING COMMA - POSITIVE-NUMBER NEWLINE -TP-END ::= 'tc-end' COLON TIMESTAMP COMMA STRING (COMMA STRING)? -TC-STANZA ::= TC-START (TC-SO | TC-SE)* TC-END -TC-START ::= 'tc-start' COLON TIMESTAMP COMMA STRING NEWLINE -TC-SO ::= 'tc-so' COLON STRING NEWLINE -TC-SE ::= 'tc-se' COLON STRING NEWLINE -TC-END ::= 'tc-end' COLON TIMESTAMP COMMA STRING COMMA TCR NEWLINE -TCR ::= 'passed' | ('failed' | 'skipped') COMMA STRING -TIMESTAMP ::= [0-9]+.[0-9]+ -.Ed -.Pp -The meaning of the constructions above is: -.Bl -tag -width TPSXCOUNTXX -.It TPS-COUNT -Indicates the number of test programs that will be executed. -There will be this exact amount of -.Sq TP-STANZA -constructions following it. -.It TP-START -Indicates the beginning of a test program. -This includes the program's name and the amount of test cases that -will follow. -.It TP-END -Indicates the completion of a test program. -This is followed by the program's name and, if the program ended -prematurely, an error message indicating the reason of its failure. -A successful execution of a test program (regardless of the status of its -test cases) must not be accompanied by any reason. -.It TC-START -Indicates the beginning of a test case. -This is accompanied by the test case's name. -.It TC-SO -Contains a text line sent to the standard output stream during the -execution of the test case. -Leading and trailing space is preserved. -.It TC-SE -Contains a text line sent to the standard error stream during the -execution of the test case. -Leading and trailing space is preserved. -.It TC-END -Indicates the completion of a test case. -This is accompanied by the test case's name, its result and the reason -associated with this result (if applicable). -.El -.Pp -An example: -.Bd -literal -offset indent -tps-count: 2 -tp-start: calculator, 1324318951.838923, 2 -tc-start: add, 1324318951.839101 -tc-end: add, 1324318951.839500, passed -tc-start: subtract, 1324318951.840001 -tc-so: 3-2 expected to return 1 but got 0 -tc-end: subtract, 1324318952.000123, failed, Calculated an unexpected value -tp-end: calculator, 1324318952.002301 -tp-start: files, 1, 1324318952.502348 -tc-start: copy, 1324318952.508291 -tc-se: could not find the cp(1) utility -tc-end: copy, 1324318953.203145, skipped -tp-end: files, 1324318953.203800 -.Ed -.Sh SEE ALSO -.Xr atf 7 diff --git a/tools/atf-report.1 b/tools/atf-report.1 deleted file mode 100644 index df03af0e072e..000000000000 --- a/tools/atf-report.1 +++ /dev/null @@ -1,168 +0,0 @@ -.\" -.\" Automated Testing Framework (atf) -.\" -.\" Copyright (c) 2007 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd December 16, 2011 -.Dt ATF-REPORT 1 -.Os -.Sh NAME -.Nm atf-report -.Nd transforms the output of atf-run to different formats -.Sh SYNOPSIS -.Nm -.Op Fl o Ar fmt1:path1 Op .. Fl o Ar fmtN:pathN -.Nm -.Fl h -.Sh DESCRIPTION -.Nm -reads the output of -.Nm atf-run -and transforms it to different formats. -Some of these are user-friendly and others are machine-parseable, which -opens a wide range of possibilities to analyze the results of a test -suite's execution. -See -.Sx Output formats -below for more details on which these formats are. -.Pp -In the first synopsis form, -.Nm -reads the output of -.Nm atf-run -through its standard input and, if no -.Fl o -options are given, prints a user-friendly report on its standard -output using the -.Sq ticker -format. -If -.Fl o -options are provided (more than one are allowed), they specify the complete -list of reports to generate. -They are all generated simultaneously, and for obvious reasons, two reports -cannot be written to the same file. -Note that the default output is suppressed when -.Fl o -is provided. -.Pp -In the second synopsis form, -.Nm -will print information about all supported options and their purpose. -.Pp -The following options are available: -.Bl -tag -width XoXfmtXpathXX -.It Fl h -Shows a short summary of all available options and their purpose. -.It Fl o Ar fmt:path -Adds a new output format. -.Ar fmt -is one of the formats described later on in -.Sx Output formats . -.Ar path -specifies where the report will be written to. -Depending on the chosen format, this may refer to a single file or to -a directory. -For those formats that write to a single file, specifying a -.Sq - -as the path will redirect the report to the standard output. -.El -.Ss Output formats -The following output formats are allowed: -.Bl -tag -width tickerXX -.It csv -A machine-parseable Comma-Separated Values (CSV) file. -This file contains the results for all test cases and test programs. -Test cases are logged using the following syntax: -.Bd -literal -offset indent -tc, duration, test-program, test-case, result[, reason] -.Ed -.Pp -The -.Sq result -field for test cases is always one of -.Sq passed , -.Sq skipped -or -.Sq failed . -The last two are always followed by a reason. -.Pp -Test programs are logged with the following syntax: -.Bd -literal -offset indent -tp, duration, test-program, result[, reason] -.Ed -.Pp -In this case, the -.Sq result -can be one of: -.Sq passed , -which denotes test programs that ran without any failure; -.Sq failed , -which refers to test programs in which one or more test cases failed; -or -.Sq bogus , -which mentions those test programs that failed to execute by some reason. -The reason field is only available in the last case. -.Pp -The time required to execute each test case and test program is -also provided. -You should not rely on the order of the entries in the resulting output. -.It ticker -A user-friendly report that shows the progress of the test suite's -execution as it operates. -This type of report should always be redirected to a virtual terminal, -not a file, as it may use control sequences that will make the output -unreadable in regular files. -.It xml -A report contained in a single XML file. -Ideal for later processing with -.Xr xsltproc 1 -to generate nice HTML reports. -.El -.Sh EXAMPLES -The most simple way of running a test suite is to pipe the output of -.Nm atf-run -through -.Nm -without any additional flags. -This will use the default output format, which is suitable to most users: -.Bd -literal -offset indent -atf-run | atf-report -.Ed -.Pp -In some situations, it may be interesting to get a machine-parseable file -aside from the standard report. -This can be done as follows: -.Bd -literal -offset indent -atf-run | atf-report -o csv:testsuite.csv -o ticker:- -.Ed -.Pp -Or if the standard report is not desired, thus achieving completely silent -operation: -atf-run | atf-report -o csv:testsuite.csv -.Sh SEE ALSO -.Xr atf-run 1 , -.Xr atf 7 diff --git a/tools/atf-report.cpp b/tools/atf-report.cpp deleted file mode 100644 index cb065f993ed9..000000000000 --- a/tools/atf-report.cpp +++ /dev/null @@ -1,710 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -} - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "application.hpp" -#include "defs.hpp" -#include "fs.hpp" -#include "reader.hpp" -#include "text.hpp" -#include "ui.hpp" - -typedef std::auto_ptr< std::ostream > ostream_ptr; - -static ostream_ptr -open_outfile(const tools::fs::path& path) -{ - ostream_ptr osp; - if (path.str() == "-") - osp = ostream_ptr(new std::ofstream("/dev/stdout")); - else - osp = ostream_ptr(new std::ofstream(path.c_str())); - if (!(*osp)) - throw std::runtime_error("Could not create file " + path.str()); - return osp; -} - -static std::string -format_tv(struct timeval* tv) -{ - std::ostringstream output; - output << static_cast< long >(tv->tv_sec) << '.' - << std::setfill('0') << std::setw(6) - << static_cast< long >(tv->tv_usec); - return output.str(); -} - -// ------------------------------------------------------------------------ -// The "writer" interface. -// ------------------------------------------------------------------------ - -//! -//! \brief A base class that defines an output format. -//! -//! The writer base class defines a generic interface to output formats. -//! This is meant to be subclassed, and each subclass can redefine any -//! method to format the information as it wishes. -//! -//! This class is not tied to a output stream nor a file because, depending -//! on the output format, we will want to write to a single file or to -//! multiple ones. -//! -class writer { -public: - writer(void) {} - virtual ~writer(void) {} - - virtual void write_info(const std::string&, const std::string&) {} - virtual void write_ntps(size_t) {} - virtual void write_tp_start(const std::string&, size_t) {} - virtual void write_tp_end(struct timeval*, const std::string&) {} - virtual void write_tc_start(const std::string&) {} - virtual void write_tc_stdout_line(const std::string&) {} - virtual void write_tc_stderr_line(const std::string&) {} - virtual void write_tc_end(const std::string&, struct timeval*, - const std::string&) {} - virtual void write_eof(void) {} -}; - -// ------------------------------------------------------------------------ -// The "csv_writer" class. -// ------------------------------------------------------------------------ - -//! -//! \brief A very simple plain-text output format. -//! -//! The csv_writer class implements a very simple plain-text output -//! format that summarizes the results of each executed test case. The -//! results are meant to be easily parseable by third-party tools, hence -//! they are formatted as a CSV file. -//! -class csv_writer : public writer { - ostream_ptr m_os; - bool m_failed; - - std::string m_tpname; - std::string m_tcname; - -public: - csv_writer(const tools::fs::path& p) : - m_os(open_outfile(p)) - { - } - - virtual - void - write_tp_start(const std::string& name, - size_t ntcs ATF_DEFS_ATTRIBUTE_UNUSED) - { - m_tpname = name; - m_failed = false; - } - - virtual - void - write_tp_end(struct timeval* tv, const std::string& reason) - { - const std::string timestamp = format_tv(tv); - - if (!reason.empty()) - (*m_os) << "tp, " << timestamp << ", " << m_tpname << ", bogus, " - << reason << "\n"; - else if (m_failed) - (*m_os) << "tp, " << timestamp << ", "<< m_tpname << ", failed\n"; - else - (*m_os) << "tp, " << timestamp << ", "<< m_tpname << ", passed\n"; - } - - virtual - void - write_tc_start(const std::string& name) - { - m_tcname = name; - } - - virtual - void - write_tc_end(const std::string& state, struct timeval* tv, - const std::string& reason) - { - std::string str = m_tpname + ", " + m_tcname + ", " + state; - if (!reason.empty()) - str += ", " + reason; - (*m_os) << "tc, " << format_tv(tv) << ", " << str << "\n"; - - if (state == "failed") - m_failed = true; - } -}; - -// ------------------------------------------------------------------------ -// The "ticker_writer" class. -// ------------------------------------------------------------------------ - -//! -//! \brief A console-friendly output format. -//! -//! The ticker_writer class implements a formatter that is user-friendly -//! in the sense that it shows the execution of test cases in an easy to -//! read format. It is not meant to be parseable and its format can -//! freely change across releases. -//! -class ticker_writer : public writer { - ostream_ptr m_os; - - size_t m_curtp, m_ntps; - size_t m_tcs_passed, m_tcs_failed, m_tcs_skipped, m_tcs_expected_failures; - std::string m_tcname, m_tpname; - std::vector< std::string > m_failed_tcs; - std::map< std::string, std::string > m_expected_failures_tcs; - std::vector< std::string > m_failed_tps; - - void - write_info(const std::string& what, const std::string& val) - { - if (what == "tests.root") { - (*m_os) << "Tests root: " << val << "\n\n"; - } - } - - void - write_ntps(size_t ntps) - { - m_curtp = 1; - m_tcs_passed = 0; - m_tcs_failed = 0; - m_tcs_skipped = 0; - m_tcs_expected_failures = 0; - m_ntps = ntps; - } - - void - write_tp_start(const std::string& tp, size_t ntcs) - { - using tools::text::to_string; - using tools::ui::format_text; - - m_tpname = tp; - - (*m_os) << format_text(tp + " (" + to_string(m_curtp) + - "/" + to_string(m_ntps) + "): " + - to_string(ntcs) + " test cases") - << "\n"; - (*m_os).flush(); - } - - void - write_tp_end(struct timeval* tv, const std::string& reason) - { - using tools::ui::format_text_with_tag; - - m_curtp++; - - if (!reason.empty()) { - (*m_os) << format_text_with_tag("BOGUS TEST PROGRAM: Cannot " - "trust its results because " - "of `" + reason + "'", - m_tpname + ": ", false) - << "\n"; - m_failed_tps.push_back(m_tpname); - } - (*m_os) << "[" << format_tv(tv) << "s]\n\n"; - (*m_os).flush(); - - m_tpname.clear(); - } - - void - write_tc_start(const std::string& tcname) - { - m_tcname = tcname; - - (*m_os) << " " + tcname + ": "; - (*m_os).flush(); - } - - void - write_tc_end(const std::string& state, struct timeval* tv, - const std::string& reason) - { - std::string str; - - (*m_os) << "[" << format_tv(tv) << "s] "; - - if (state == "expected_death" || state == "expected_exit" || - state == "expected_failure" || state == "expected_signal" || - state == "expected_timeout") { - str = "Expected failure: " + reason; - m_tcs_expected_failures++; - m_expected_failures_tcs[m_tpname + ":" + m_tcname] = reason; - } else if (state == "failed") { - str = "Failed: " + reason; - m_tcs_failed++; - m_failed_tcs.push_back(m_tpname + ":" + m_tcname); - } else if (state == "passed") { - str = "Passed."; - m_tcs_passed++; - } else if (state == "skipped") { - str = "Skipped: " + reason; - m_tcs_skipped++; - } else - std::abort(); - - // XXX Wrap text. format_text_with_tag does not currently allow - // to specify the current column, which is needed because we have - // already printed the tc's name. - (*m_os) << str << '\n'; - - m_tcname = ""; - } - - static void - write_expected_failures(const std::map< std::string, std::string >& xfails, - std::ostream& os) - { - using tools::ui::format_text; - using tools::ui::format_text_with_tag; - - os << format_text("Test cases for known bugs:") << "\n"; - - for (std::map< std::string, std::string >::const_iterator iter = - xfails.begin(); iter != xfails.end(); iter++) { - const std::string& name = (*iter).first; - const std::string& reason = (*iter).second; - - os << format_text_with_tag(reason, " " + name + ": ", false) - << "\n"; - } - } - - void - write_eof(void) - { - using tools::text::join; - using tools::text::to_string; - using tools::ui::format_text; - using tools::ui::format_text_with_tag; - - if (!m_failed_tps.empty()) { - (*m_os) << format_text("Failed (bogus) test programs:") - << "\n"; - (*m_os) << format_text_with_tag(join(m_failed_tps, ", "), - " ", false) << "\n\n"; - } - - if (!m_expected_failures_tcs.empty()) { - write_expected_failures(m_expected_failures_tcs, *m_os); - (*m_os) << "\n"; - } - - if (!m_failed_tcs.empty()) { - (*m_os) << format_text("Failed test cases:") << "\n"; - (*m_os) << format_text_with_tag(join(m_failed_tcs, ", "), - " ", false) << "\n\n"; - } - - (*m_os) << format_text("Summary for " + to_string(m_ntps) + - " test programs:") << "\n"; - (*m_os) << format_text_with_tag(to_string(m_tcs_passed) + - " passed test cases.", - " ", false) << "\n"; - (*m_os) << format_text_with_tag(to_string(m_tcs_failed) + - " failed test cases.", - " ", false) << "\n"; - (*m_os) << format_text_with_tag(to_string(m_tcs_expected_failures) + - " expected failed test cases.", - " ", false) << "\n"; - (*m_os) << format_text_with_tag(to_string(m_tcs_skipped) + - " skipped test cases.", - " ", false) << "\n"; - } - -public: - ticker_writer(const tools::fs::path& p) : - m_os(open_outfile(p)) - { - } -}; - -// ------------------------------------------------------------------------ -// The "xml" class. -// ------------------------------------------------------------------------ - -//! -//! \brief A single-file XML output format. -//! -//! The xml_writer class implements a formatter that prints the results -//! of test cases in an XML format easily parseable later on by other -//! utilities. -//! -class xml_writer : public writer { - ostream_ptr m_os; - - std::string m_tcname, m_tpname; - - static - std::string - attrval(const std::string& str) - { - return str; - } - - static - std::string - elemval(const std::string& str) - { - std::ostringstream buf; - for (std::string::const_iterator iter = str.begin(); - iter != str.end(); iter++) { - const int character = static_cast< unsigned char >(*iter); - if (character == '&') { - buf << "&"; - } else if (character == '<') { - buf << "<"; - } else if (character == '>') { - buf << ">"; - } else if (std::isalnum(character) || std::ispunct(character) || - std::isspace(character)) { - buf << static_cast< char >(character); - } else { - buf << "&#" << character << ";"; - } - } - return buf.str(); - } - - void - write_info(const std::string& what, const std::string& val) - { - (*m_os) << "" << val << "\n"; - } - - void - write_tp_start(const std::string& tp, - size_t ntcs ATF_DEFS_ATTRIBUTE_UNUSED) - { - (*m_os) << "\n"; - } - - void - write_tp_end(struct timeval* tv, const std::string& reason) - { - if (!reason.empty()) - (*m_os) << "" << elemval(reason) << "\n"; - (*m_os) << "" << format_tv(tv) << ""; - (*m_os) << "\n"; - } - - void - write_tc_start(const std::string& tcname) - { - (*m_os) << "\n"; - } - - void - write_tc_stdout_line(const std::string& line) - { - (*m_os) << "" << elemval(line) << "\n"; - } - - void - write_tc_stderr_line(const std::string& line) - { - (*m_os) << "" << elemval(line) << "\n"; - } - - void - write_tc_end(const std::string& state, struct timeval* tv, - const std::string& reason) - { - std::string str; - - if (state == "expected_death" || state == "expected_exit" || - state == "expected_failure" || state == "expected_signal" || - state == "expected_timeout") { - (*m_os) << "<" << state << ">" << elemval(reason) - << "\n"; - } else if (state == "passed") { - (*m_os) << "\n"; - } else if (state == "failed") { - (*m_os) << "" << elemval(reason) << "\n"; - } else if (state == "skipped") { - (*m_os) << "" << elemval(reason) << "\n"; - } else - std::abort(); - (*m_os) << "" << format_tv(tv) << ""; - (*m_os) << "\n"; - } - - void - write_eof(void) - { - (*m_os) << "\n"; - } - -public: - xml_writer(const tools::fs::path& p) : - m_os(open_outfile(p)) - { - (*m_os) << "\n" - << "\n\n" - "\n"; - } -}; - -// ------------------------------------------------------------------------ -// The "converter" class. -// ------------------------------------------------------------------------ - -//! -//! \brief A reader that redirects events to multiple writers. -//! -//! The converter class implements an atf_tps_reader that, for each event -//! raised by the parser, redirects it to multiple writers so that they -//! can reformat it according to their output rules. -//! -class converter : public tools::atf_report::atf_tps_reader { - typedef std::vector< writer* > outs_vector; - outs_vector m_outs; - - void - got_info(const std::string& what, const std::string& val) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_info(what, val); - } - - void - got_ntps(size_t ntps) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_ntps(ntps); - } - - void - got_tp_start(const std::string& tp, size_t ntcs) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_tp_start(tp, ntcs); - } - - void - got_tp_end(struct timeval* tv, const std::string& reason) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_tp_end(tv, reason); - } - - void - got_tc_start(const std::string& tcname) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_tc_start(tcname); - } - - void - got_tc_stdout_line(const std::string& line) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_tc_stdout_line(line); - } - - void - got_tc_stderr_line(const std::string& line) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_tc_stderr_line(line); - } - - void - got_tc_end(const std::string& state, struct timeval* tv, - const std::string& reason) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_tc_end(state, tv, reason); - } - - void - got_eof(void) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - (*iter)->write_eof(); - } - -public: - converter(std::istream& is) : - tools::atf_report::atf_tps_reader(is) - { - } - - ~converter(void) - { - for (outs_vector::iterator iter = m_outs.begin(); - iter != m_outs.end(); iter++) - delete *iter; - } - - void - add_output(const std::string& fmt, const tools::fs::path& p) - { - if (fmt == "csv") { - m_outs.push_back(new csv_writer(p)); - } else if (fmt == "ticker") { - m_outs.push_back(new ticker_writer(p)); - } else if (fmt == "xml") { - m_outs.push_back(new xml_writer(p)); - } else - throw std::runtime_error("Unknown format `" + fmt + "'"); - } -}; - -// ------------------------------------------------------------------------ -// The "atf_report" class. -// ------------------------------------------------------------------------ - -class atf_report : public tools::application::app { - static const char* m_description; - - typedef std::pair< std::string, tools::fs::path > fmt_path_pair; - std::vector< fmt_path_pair > m_oflags; - - void process_option(int, const char*); - options_set specific_options(void) const; - -public: - atf_report(void); - - int main(void); -}; - -const char* atf_report::m_description = - "atf-report is a tool that parses the output of atf-run and " - "generates user-friendly reports in multiple different formats."; - -atf_report::atf_report(void) : - app(m_description, "atf-report(1)", "atf(7)") -{ -} - -void -atf_report::process_option(int ch, const char* arg) -{ - switch (ch) { - case 'o': - { - std::string str(arg); - std::string::size_type pos = str.find(':'); - if (pos == std::string::npos) - throw std::runtime_error("Syntax error in -o option"); - else { - std::string fmt = str.substr(0, pos); - tools::fs::path path = tools::fs::path(str.substr(pos + 1)); - m_oflags.push_back(fmt_path_pair(fmt, path)); - } - } - break; - - default: - std::abort(); - } -} - -atf_report::options_set -atf_report::specific_options(void) - const -{ - using tools::application::option; - options_set opts; - opts.insert(option('o', "fmt:path", "Adds a new output file; multiple " - "ones can be specified, and a - " - "path means stdout")); - return opts; -} - -int -atf_report::main(void) -{ - if (m_argc > 0) - throw std::runtime_error("No arguments allowed"); - - if (m_oflags.empty()) - m_oflags.push_back(fmt_path_pair("ticker", tools::fs::path("-"))); - - // Look for path duplicates. - std::set< tools::fs::path > paths; - for (std::vector< fmt_path_pair >::const_iterator iter = m_oflags.begin(); - iter != m_oflags.end(); iter++) { - tools::fs::path p = (*iter).second; - if (p == tools::fs::path("/dev/stdout")) - p = tools::fs::path("-"); - if (paths.find(p) != paths.end()) - throw std::runtime_error("The file `" + p.str() + "' was " - "specified more than once"); - paths.insert((*iter).second); - } - - // Generate the output files. - converter cnv(std::cin); - for (std::vector< fmt_path_pair >::const_iterator iter = m_oflags.begin(); - iter != m_oflags.end(); iter++) - cnv.add_output((*iter).first, (*iter).second); - cnv.read(); - - return EXIT_SUCCESS; -} - -int -main(int argc, char* const* argv) -{ - return atf_report().run(argc, argv); -} diff --git a/tools/atf-report_test.sh b/tools/atf-report_test.sh deleted file mode 100755 index 9f0f47fc61cf..000000000000 --- a/tools/atf-report_test.sh +++ /dev/null @@ -1,449 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -create_helpers() -{ - mkdir dir1 - cp $(atf_get_srcdir)/pass_helper dir1/tp1 - cp $(atf_get_srcdir)/fail_helper dir1/tp2 - cp $(atf_get_srcdir)/pass_helper tp3 - cp $(atf_get_srcdir)/fail_helper tp4 - - cat >tp5 <Atffile <dir1/Atffile <etc/atf-run.hooks <tps.out 2>/dev/null - rm -rf etc -} - -atf_test_case default -default_head() -{ - atf_set "descr" "Checks that the default output uses the ticker" \ - "format" -} -default_body() -{ - create_helpers - run_helpers - - # Check that the default output uses the ticker format. - atf_check -s eq:0 -o match:'test cases' -o match:'Failed test cases' \ - -o match:'Summary for' -e empty -x 'atf-report Atffile <expout <expout <expout <>'; expected \`:' -EOF -# NO_CHECK_STYLE_END - - atf_check -s eq:0 -o file:expout -e empty -x \ - "atf-report -o csv:- expout <>'; expected \`:'' -[#.#s] - -Failed (bogus) test programs: - tp5 - -Failed test cases: - dir1/tp2:main, tp4:main - -Summary for 5 test programs: - 2 passed test cases. - 2 failed test cases. - 0 expected failed test cases. - 0 skipped test cases. -EOF - - atf_check -s eq:0 -o file:expout -e empty -x \ - "atf-report -o ticker:- expout < - - - -A value - - - -#.# -#.# - - -This always fails -#.# -#.# - - - -#.# -#.# - - -This always fails -#.# -#.# - -Invalid format for test case list: 1: Unexpected token \`<<NEWLINE>>'; expected \`:' -#.# -Another value - -EOF -# NO_CHECK_STYLE_END - - atf_check -s eq:0 -o file:expout -e empty -x \ - "atf-report -o xml:- < tps.out | sed -E -e 's/>[0-9]+.[0-9]{6}#.#Atffile <expout < - - - -A value - - ---- a 2007-11-04 14:00:41.000000000 +0100 -+++ b 2007-11-04 14:00:48.000000000 +0100 -@@ -1,7 +1,7 @@ - This test is meant to simulate a diff. - Blank space at beginning of context lines must be preserved. - --First original line. --Second original line. -+First modified line. -+Second modified line. - - EOF - -#.# -#.# -Another value - -EOF -# NO_CHECK_STYLE_END - - run_helpers - atf_check -s eq:0 -o file:expout -e empty -x \ - "atf-report -o xml:- [0-9]+.[0-9]{6}#.#experr <.conf . -.It -Configuration variables defined in the user-specific configuration file -shared among all test suites. -This lives in -.Pa ${HOME}/.atf/common.conf . -.It -Configuration variables defined in the user-specific test-suite-specific -configuration file. -This lives in -.Pa ${HOME}/.atf/.conf . -.It -Configuration variables provided as part of the command line through the -.Fl v -option. -.El -.Pp -The value of -.Va ATF_CONFDIR -in the above list determined as detailed in -.Xr atf-config 1 . -.Pp -The following configuration variables are globally recognized: -.Bl -tag -width XunprivilegedXuserXX -.It Va unprivileged-user -The name of the system user that atf-run will drop root privileges into -for test cases defining -.Sq require.user=unprivileged . -Note that this is -.Em not provided for security purposes ; -this feature is only for the convenience of the user. -.El -.Ss Hooks -.Nm Ns 's -internal behavior can be customized by the system administrator and the -user by means of hooks. -These hooks are written in the shell script language for simplicity and -are stored in the following files, which are read in the order provided -below: -.Bl -enum -.It -${ATF_CONFDIR}/atf-run.hooks -.It -${HOME}/.atf/atf-run.hooks -.El -.Pp -The following hooks are supported: -.Bl -tag -width infoXstartXhookXX -.It info_start_hook -Called before -.Nm -executes any test program. -The purpose of this hook is to write additional -.Sq info -stanzas to the top of the output report; these are defined by the -.Sq application/X-atf-tps format -described in -.Xr atf-formats 5 . -Always use the -.Sq atf_tps_writer_info -function to print these. -.Pp -This takes no parameters. -.It info_end_hook -Similar to -.Sq info_start_hook -but executed after all test programs have been run so that additional -.Sq info -stanzas can be added to the bottom of the output report. -.Pp -This takes no parameters. -.El -.Pp -All hooks are accompanied by a function named -.Sq default_ -that can be executed by them to invoke the default behavior built into -.Nm . -For example, in order to extend the default -.Sq info_start_hook -hook, we could write the following function: -.Bd -literal -offset indent -info_start_hook() -{ - default_info_start_hook "${@}" - - atf_tps_writer_info "uptime" "$(uptime)" -} -.Ed -.Sh SEE ALSO -.Xr atf-report 1 , -.Xr atf-test-program 1 , -.Xr atf 7 diff --git a/tools/atf-run.cpp b/tools/atf-run.cpp deleted file mode 100644 index 3bc6f63c1dcf..000000000000 --- a/tools/atf-run.cpp +++ /dev/null @@ -1,567 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(HAVE_CONFIG_H) -#include "bconfig.h" -#endif - -extern "C" { -#include -#include -#include -#include -#include -} - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "application.hpp" -#include "atffile.hpp" -#include "config.hpp" -#include "config_file.hpp" -#include "env.hpp" -#include "exceptions.hpp" -#include "fs.hpp" -#include "parser.hpp" -#include "process.hpp" -#include "requirements.hpp" -#include "test-program.hpp" -#include "text.hpp" - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -} // 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; - - vars_map m_cmdline_vars; - - static vars_map::value_type parse_var(const std::string&); - - void process_option(int, const char*); - std::string specific_args(void) const; - options_set specific_options(void) const; - - void parse_vflag(const std::string&); - - std::vector< std::string > conf_args(void) const; - - size_t count_tps(std::vector< std::string >) const; - - int run_test(const tools::fs::path&, 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&, - tools::test_program::atf_tps_writer&, - const vars_map&); - - tools::test_program::test_case_result get_test_case_result( - const std::string&, const tools::process::status&, - const tools::fs::path&) const; - -public: - atf_run(void); - - int main(void); -}; - -static void -sanitize_gdb_env(void) -{ - try { - tools::env::unset("TERM"); - } catch (...) { - // Just swallow exceptions here; they cannot propagate into C, which - // is where this function is called from, and even if these exceptions - // appear they are benign. - } -} - -static void -dump_stacktrace(const tools::fs::path& tp, const tools::process::status& s, - const tools::fs::path& workdir, - tools::test_program::atf_tps_writer& w) -{ - assert(s.signaled() && s.coredump()); - - 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"); - if (!tools::fs::exists(corename)) { - w.stderr_tc("Expected file " + corename.str() + " not found"); - return; - } - - const tools::fs::path gdb(GDB); - const tools::fs::path gdbout = workdir / "gdb.out"; - const tools::process::argv_array args(gdb.leaf_name().c_str(), "-batch", - "-q", "-ex", "bt", tp.c_str(), - corename.c_str(), NULL); - tools::process::status status = tools::process::exec( - gdb, args, - tools::process::stream_redirect_path(gdbout), - tools::process::stream_redirect_path(tools::fs::path("/dev/null")), - sanitize_gdb_env); - 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."; - -atf_run::atf_run(void) : - app(m_description, "atf-run(1)", "atf(7)") -{ -} - -void -atf_run::process_option(int ch, const char* arg) -{ - switch (ch) { - case 'v': - parse_vflag(arg); - break; - - default: - std::abort(); - } -} - -std::string -atf_run::specific_args(void) - const -{ - return "[test-program1 .. test-programN]"; -} - -atf_run::options_set -atf_run::specific_options(void) - const -{ - using tools::application::option; - options_set opts; - opts.insert(option('v', "var=value", "Sets the configuration variable " - "`var' to `value'; overrides " - "values in configuration files")); - return opts; -} - -void -atf_run::parse_vflag(const std::string& str) -{ - if (str.empty()) - throw std::runtime_error("-v requires a non-empty argument"); - - std::vector< std::string > ws = tools::text::split(str, "="); - if (ws.size() == 1 && str[str.length() - 1] == '=') { - m_cmdline_vars[ws[0]] = ""; - } else { - if (ws.size() != 2) - throw std::runtime_error("-v requires an argument of the form " - "var=value"); - - m_cmdline_vars[ws[0]] = ws[1]; - } -} - -int -atf_run::run_test(const tools::fs::path& tp, - tools::test_program::atf_tps_writer& w, - const vars_map& config) -{ - tools::fs::file_info fi(tp); - - int errcode; - if (fi.get_type() == tools::fs::file_info::dir_type) - errcode = run_test_directory(tp, w); - else { - const vars_map effective_config = - tools::config_file::merge_configs(config, m_cmdline_vars); - - errcode = run_test_program(tp, w, effective_config); - } - return errcode; -} - -int -atf_run::run_test_directory(const tools::fs::path& tp, - tools::test_program::atf_tps_writer& w) -{ - tools::atffile af = tools::read_atffile(tp / "Atffile"); - - vars_map test_suite_vars; - { - vars_map::const_iterator iter = af.props().find("test-suite"); - assert(iter != af.props().end()); - test_suite_vars = tools::config_file::read_config_files((*iter).second); - } - - 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, - tools::config_file::merge_configs(af.conf(), test_suite_vars)); - ok &= (result == EXIT_SUCCESS); - } - - return ok ? EXIT_SUCCESS : EXIT_FAILURE; -} - -tools::test_program::test_case_result -atf_run::get_test_case_result(const std::string& broken_reason, - const tools::process::status& s, - const tools::fs::path& resfile) - const -{ - using tools::text::to_string; - using tools::test_program::read_test_case_result; - using tools::test_program::test_case_result; - - if (!broken_reason.empty()) { - test_case_result tcr; - - try { - tcr = read_test_case_result(resfile); - - if (tcr.state() == "expected_timeout") { - return tcr; - } else { - return test_case_result("failed", -1, broken_reason); - } - } catch (const std::runtime_error&) { - return test_case_result("failed", -1, broken_reason); - } - } - - if (s.exited()) { - test_case_result tcr; - - try { - tcr = read_test_case_result(resfile); - } catch (const std::runtime_error& e) { - return test_case_result("failed", -1, "Test case exited " - "normally but failed to create the results file: " + - std::string(e.what())); - } - - if (tcr.state() == "expected_death") { - return tcr; - } else if (tcr.state() == "expected_exit") { - if (tcr.value() == -1 || s.exitstatus() == tcr.value()) - return tcr; - else - return test_case_result("failed", -1, "Test case was " - "expected to exit with a " + to_string(tcr.value()) + - " error code but returned " + to_string(s.exitstatus())); - } else if (tcr.state() == "expected_failure") { - if (s.exitstatus() == EXIT_SUCCESS) - return tcr; - else - return test_case_result("failed", -1, "Test case returned an " - "error in expected_failure mode but it should not have"); - } else if (tcr.state() == "expected_signal") { - return test_case_result("failed", -1, "Test case exited cleanly " - "but was expected to receive a signal"); - } else if (tcr.state() == "failed") { - if (s.exitstatus() == EXIT_SUCCESS) - return test_case_result("failed", -1, "Test case " - "exited successfully but reported failure"); - else - return tcr; - } else if (tcr.state() == "passed") { - if (s.exitstatus() == EXIT_SUCCESS) - return tcr; - else - return test_case_result("failed", -1, "Test case exited as " - "passed but reported an error"); - } else if (tcr.state() == "skipped") { - if (s.exitstatus() == EXIT_SUCCESS) - return tcr; - else - return test_case_result("failed", -1, "Test case exited as " - "skipped but reported an error"); - } - } else if (s.signaled()) { - test_case_result tcr; - - try { - tcr = read_test_case_result(resfile); - } catch (const std::runtime_error&) { - return test_case_result("failed", -1, "Test program received " - "signal " + tools::text::to_string(s.termsig()) + - (s.coredump() ? " (core dumped)" : "")); - } - - if (tcr.state() == "expected_death") { - return tcr; - } else if (tcr.state() == "expected_signal") { - if (tcr.value() == -1 || s.termsig() == tcr.value()) - return tcr; - else - return test_case_result("failed", -1, "Test case was " - "expected to exit due to a " + to_string(tcr.value()) + - " signal but got " + to_string(s.termsig())); - } else { - return test_case_result("failed", -1, "Test program received " - "signal " + tools::text::to_string(s.termsig()) + - (s.coredump() ? " (core dumped)" : "") + " and created a " - "bogus results file"); - } - } - std::abort(); - return test_case_result(); -} - -int -atf_run::run_test_program(const tools::fs::path& tp, - tools::test_program::atf_tps_writer& w, - const vars_map& config) -{ - int errcode = EXIT_SUCCESS; - - tools::test_program::metadata md; - try { - md = tools::test_program::get_metadata(tp, config); - } catch (const tools::parser::format_error& e) { - w.start_tp(tp.str(), 0); - w.end_tp("Invalid format for test case list: " + std::string(e.what())); - return EXIT_FAILURE; - } catch (const tools::parser::parse_errors& e) { - const std::string reason = tools::text::join(e, "; "); - w.start_tp(tp.str(), 0); - w.end_tp("Invalid format for test case list: " + reason); - return EXIT_FAILURE; - } - - tools::fs::temp_dir resdir( - tools::fs::path(tools::config::get("atf_workdir")) / "atf-run.XXXXXX"); - - w.start_tp(tp.str(), md.test_cases.size()); - if (md.test_cases.empty()) { - w.end_tp("Bogus test program: reported 0 test cases"); - errcode = EXIT_FAILURE; - } else { - 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; - const vars_map& tcmd = (*iter).second; - - w.start_tc(tcname); - - try { - const std::string& reqfail = tools::check_requirements( - tcmd, config); - if (!reqfail.empty()) { - w.end_tc("skipped", reqfail); - continue; - } - } catch (const std::runtime_error& e) { - w.end_tc("failed", e.what()); - errcode = EXIT_FAILURE; - continue; - } - - const std::pair< int, int > user = tools::get_required_user( - tcmd, config); - - tools::fs::path resfile = resdir.get_path() / "tcr"; - assert(!tools::fs::exists(resfile)); - try { - const bool has_cleanup = tools::text::to_bool( - (*tcmd.find("has.cleanup")).second); - - tools::fs::temp_dir workdir(tools::fs::path(tools::config::get( - "atf_workdir")) / "atf-run.XXXXXX"); - if (user.first != -1 && user.second != -1) { - if (::chown(workdir.get_path().c_str(), user.first, - user.second) == -1) { - throw tools::system_error("chown(" + - workdir.get_path().str() + ")", "chown(2) failed", - errno); - } - resfile = workdir.get_path() / "tcr"; - } - - std::pair< std::string, const tools::process::status > s = - tools::test_program::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)tools::test_program::run_test_case( - tp, tcname, "cleanup", tcmd, - config, resfile, workdir.get_path(), w); - - // TODO: Force deletion of workdir. - - tools::test_program::test_case_result tcr = - get_test_case_result(s.first, s.second, resfile); - - w.end_tc(tcr.state(), tcr.reason()); - if (tcr.state() == "failed") - errcode = EXIT_FAILURE; - } catch (...) { - if (tools::fs::exists(resfile)) - tools::fs::remove(resfile); - throw; - } - if (tools::fs::exists(resfile)) - tools::fs::remove(resfile); - - } - w.end_tp(""); - } - - return errcode; -} - -size_t -atf_run::count_tps(std::vector< std::string > tps) - const -{ - size_t ntps = 0; - - for (std::vector< std::string >::const_iterator iter = tps.begin(); - iter != tps.end(); iter++) { - tools::fs::path tp(*iter); - tools::fs::file_info fi(tp); - - if (fi.get_type() == tools::fs::file_info::dir_type) { - tools::atffile af = tools::read_atffile(tp / "Atffile"); - std::vector< std::string > aux = af.tps(); - for (std::vector< std::string >::iterator i2 = aux.begin(); - i2 != aux.end(); i2++) - *i2 = (tp / *i2).str(); - ntps += count_tps(aux); - } else - ntps++; - } - - return ntps; -} - -static -void -call_hook(const std::string& tool, const std::string& hook) -{ - const tools::fs::path sh(tools::config::get("atf_shell")); - const tools::fs::path hooks = - tools::fs::path(tools::config::get("atf_pkgdatadir")) / (tool + ".hooks"); - - const tools::process::status s = - tools::process::exec(sh, - tools::process::argv_array(sh.c_str(), hooks.c_str(), - hook.c_str(), NULL), - tools::process::stream_inherit(), - tools::process::stream_inherit()); - - - if (!s.exited() || s.exitstatus() != EXIT_SUCCESS) - throw std::runtime_error("Failed to run the '" + hook + "' hook " - "for '" + tool + "'"); -} - -int -atf_run::main(void) -{ - tools::atffile af = tools::read_atffile(tools::fs::path("Atffile")); - - std::vector< std::string > tps; - tps = af.tps(); - if (m_argc >= 1) { - // TODO: Ensure that the given test names are listed in the - // Atffile. Take into account that the file can be using globs. - tps.clear(); - for (int i = 0; i < m_argc; i++) - tps.push_back(m_argv[i]); - } - - // Read configuration data for this test suite. - vars_map test_suite_vars; - { - vars_map::const_iterator iter = af.props().find("test-suite"); - assert(iter != af.props().end()); - test_suite_vars = tools::config_file::read_config_files((*iter).second); - } - - tools::test_program::atf_tps_writer w(std::cout); - call_hook("atf-run", "info_start_hook"); - w.ntps(count_tps(tps)); - - bool ok = true; - for (std::vector< std::string >::const_iterator iter = tps.begin(); - iter != tps.end(); iter++) { - const bool result = run_test(tools::fs::path(*iter), w, - tools::config_file::merge_configs(af.conf(), test_suite_vars)); - ok &= (result == EXIT_SUCCESS); - } - - call_hook("atf-run", "info_end_hook"); - - return ok ? EXIT_SUCCESS : EXIT_FAILURE; -} - -int -main(int argc, char* const* argv) -{ - return atf_run().run(argc, argv); -} diff --git a/tools/atf-run_test.sh b/tools/atf-run_test.sh deleted file mode 100755 index afd013efbf06..000000000000 --- a/tools/atf-run_test.sh +++ /dev/null @@ -1,1134 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -create_atffile() -{ - ATF_CONFDIR="$(pwd)"; export ATF_CONFDIR - - cat >Atffile <>Atffile - done -} - -create_helper() -{ - cp $(atf_get_srcdir)/misc_helpers helper - create_atffile helper - TESTCASE=${1}; export TESTCASE -} - -create_helper_stdin() -{ - # TODO: This really, really, really must use real test programs. - cat >${1} <>${1} - [ ${cnt} -lt ${2} ] && echo "echo" >>${1} - cnt=$((${cnt} + 1)) - done -cat >>${1} <>${1} -} - -create_mount_helper() -{ - cat >${1} <>${1} - cat >>${1} <etc/common.conf <.conf." - cat >etc/atf.conf <.atf/common.conf <.conf." - cat >.atf/atf.conf <etc/common.conf <>Atffile - atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \ - "ATF_CONFDIR=$(pwd)/etc atf-run helper" - - echo "Checking that defining 'testvar' trough the configuration" \ - "file overrides the one in the Atffile." - mkdir etc - cat >etc/common.conf <> Atffile - atf_check -s eq:1 -o ignore -e ignore -x "ATF_CONFDIR=$(pwd)/etc atf-run" - - echo "Checking that defining 'testvar' in the correct Atffile works." - echo 'conf: testvar = "a value"' >>dir/Atffile - atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \ - "ATF_CONFDIR=$(pwd)/etc atf-run" -} - -atf_test_case fds -fds_head() -{ - atf_set "descr" "Tests that all streams are properly captured" -} -fds_body() -{ - create_helper fds - - atf_check -s eq:0 \ - -o match:'^tc-so:msg1 to stdout$' \ - -o match:'^tc-so:msg2 to stdout$' \ - -o match:'^tc-se:msg1 to stderr$' \ - -o match:'^tc-se:msg2 to stderr$' \ - -e empty atf-run -} - -atf_test_case mux_streams -mux_streams_head() -{ - atf_set "descr" "Tests for a race condition in stream multiplexing" -} -mux_streams_body() -{ - create_helper mux_streams - - for i in 1 2 3 4 5; do - echo "Attempt ${i}" - atf_check -s eq:0 -o match:'stdout 9999' -o match:'stderr 9999' atf-run - done -} - -atf_test_case expect -expect_head() -{ - atf_set "descr" "Tests the processing of test case results and the" \ - "expect features" -} -expect_body() -{ - ln -s "$(atf_get_srcdir)/expect_helpers" . - create_atffile expect_helpers - - atf_check -s eq:1 \ - -o match:'death_and_exit, expected_death' \ - -o match:'death_and_signal, expected_death' \ - -o match:'death_but_pass, failed' \ - -o match:'exit_any_and_exit, expected_exit' \ - -o match:'exit_but_pass, failed' \ - -o match:'exit_code_and_exit, expected_exit' \ - -o match:'fail_and_fail_check, expected_failure' \ - -o match:'fail_and_fail_requirement, expected_failure' \ - -o match:'fail_but_pass, failed' \ - -o match:'pass_and_pass, passed' \ - -o match:'pass_but_fail_check, failed' \ - -o match:'pass_but_fail_requirement, failed' \ - -o match:'signal_any_and_signal, expected_signal' \ - -o match:'signal_but_pass, failed' \ - -o match:'signal_no_and_signal, expected_signal' \ - -o match:'timeout_and_hang, expected_timeout' \ - -o match:'timeout_but_pass, failed' \ - -e empty atf-run -} - -atf_test_case missing_results -missing_results_head() -{ - atf_set "descr" "Ensures that atf-run correctly handles test cases that " \ - "do not create the results file" -} -missing_results_body() -{ - create_helper_stdin helper 1 <\${resfile} -echo 'line 2' >>\${resfile} -exit 0 -EOF - chmod +x helper - - create_atffile helper - - re='^tc-end: [0-9][0-9]*\.[0-9]*, tc1,' - atf_check -s eq:1 -o match:"${re} .*line 1.*line 2" -e empty atf-run -} - -atf_test_case broken_tp_list -broken_tp_list_head() -{ - atf_set "descr" "Ensures that atf-run reports test programs that" \ - "provide a bogus test case list" -} -broken_tp_list_body() -{ - cat >helper <\${resfile} -exit 0 -EOF - chmod +x helper - - create_atffile helper - - re='^tc-end: [0-9][0-9]*\.[0-9]*, tc1,' - atf_check -s eq:1 \ - -o match:"${re} .*exited successfully.*reported failure" \ - -e empty atf-run -} - -atf_test_case signaled -signaled_head() -{ - atf_set "descr" "Ensures that atf-run reports test program's crashes" \ - "correctly regardless of their actual results" -} -signaled_body() -{ - create_helper_stdin helper 2 <\${resfile} -case \${testcase} in - tc1) ;; - tc2) echo "Killing myself!" ; kill -9 \$\$ ;; -esac -EOF - chmod +x helper - - create_atffile helper - - re='^tc-end: [0-9][0-9]*\.[0-9]*, tc2,' - atf_check -s eq:1 -o match:"${re} .*received signal 9" \ - -e empty atf-run -} - -atf_test_case hooks -hooks_head() -{ - atf_set "descr" "Checks that the default hooks work and that they" \ - "can be overriden by the user" -} -hooks_body() -{ - cp $(atf_get_srcdir)/pass_helper helper - create_atffile helper - - mkdir atf - mkdir .atf - - echo "Checking default hooks" - atf_check -s eq:0 -o match:'^info: time.start, ' \ - -o match:'^info: time.end, ' -e empty -x \ - "ATF_CONFDIR=$(pwd)/atf atf-run" - - echo "Checking the system-wide info_start hook" - cat >atf/atf-run.hooks <.atf/atf-run.hooks <atf/atf-run.hooks <.atf/atf-run.hooks <\${ROOT} -mkdir foo -mkdir foo/bar -mkdir foo/bar/mnt -do_mount foo/bar/mnt -mkdir foo/baz -do_mount foo/baz -mkdir foo/baz/foo -mkdir foo/baz/foo/bar -do_mount foo/baz/foo/bar -EOF - create_atffile helper - chmod +x helper - - platform=$(uname) - case ${platform} in - Linux|FreeBSD|NetBSD|SunOS) - ;; - *) - # XXX Possibly specify in meta-data too. - atf_skip "Test unimplemented in this platform (${platform})" - ;; - esac - - atf_check -s eq:0 -o match:"main, passed" -e ignore atf-run helper - mount | grep $(cat root) && atf_fail "Some file systems remain mounted" - atf_check -s eq:1 -o empty -e empty test -d $(cat root)/foo -} - -atf_test_case cleanup_symlink -cleanup_symlink_head() -{ - atf_set "descr" "Tests that the removal algorithm does not follow" \ - "symlinks, which may live in another device and thus" \ - "be treated as mount points" - atf_set "require.user" "root" -} -cleanup_symlink_body() -{ - ROOT="$(pwd)/root"; export ROOT - - create_mount_helper helper <\${ROOT} -atf_check -s eq:0 -o empty -e empty mkdir foo -atf_check -s eq:0 -o empty -e empty mkdir foo/bar -do_mount foo/bar -atf_check -s eq:0 -o empty -e empty touch a -atf_check -s eq:0 -o empty -e empty ln -s "\$(pwd)/a" foo/bar -EOF - create_atffile helper - chmod +x helper - - platform=$(uname) - case ${platform} in - Linux|FreeBSD|NetBSD|SunOS) - ;; - *) - # XXX Possibly specify in meta-data too. - atf_skip "Test unimplemented in this platform (${platform})" - ;; - esac - - atf_check -s eq:0 -o match:"main, passed" -e ignore atf-run helper - mount | grep $(cat root) && atf_fail "Some file systems remain mounted" - atf_check -s eq:1 -o empty -e empty test -d $(cat root)/foo -} - -atf_test_case require_arch -require_arch_head() -{ - atf_set "descr" "Tests that atf-run validates the require.arch property" -} -require_arch_body() -{ - create_helper require_arch - create_atffile helper - - echo "Checking for the real architecture" - arch=$(atf-config -t atf_arch) - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v arch="${arch}" helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v arch="foo ${arch}" helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v arch="${arch} foo" helper - - echo "Checking for a fictitious architecture" - arch=fictitious - export ATF_ARCH=fictitious - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v arch="${arch}" helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v arch="foo ${arch}" helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v arch="${arch} foo" helper - - echo "Triggering some failures" - atf_check -s eq:0 -o match:"${TESTCASE}, skipped, .*foo.*architecture" \ - -e ignore atf-run -v arch="foo" helper - atf_check -s eq:0 \ - -o match:"${TESTCASE}, skipped, .*foo bar.*architectures" -e ignore \ - atf-run -v arch="foo bar" helper - atf_check -s eq:0 \ - -o match:"${TESTCASE}, skipped, .*fictitiousxxx.*architecture" \ - -e ignore atf-run -v arch="${arch}xxx" helper -} - -atf_test_case require_config -require_config_head() -{ - atf_set "descr" "Tests that atf-run validates the require.config property" -} -require_config_body() -{ - create_helper require_config - create_atffile helper - - atf_check -s eq:0 -o match:"${TESTCASE}, skipped, .*var1.*not defined" \ - -e ignore atf-run helper - atf_check -s eq:0 -o match:"${TESTCASE}, skipped, .*var2.*not defined" \ - -e ignore atf-run -v var1=foo helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v var1=a -v var2=' ' helper -} - -atf_test_case require_files -require_files_head() -{ - atf_set "descr" "Tests that atf-run validates the require.files property" -} -require_files_body() -{ - create_helper require_files - create_atffile helper - - touch i-exist - - echo "Checking absolute paths" - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v files='/bin/cp' helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v files="$(pwd)/i-exist" helper - atf_check -s eq:0 \ - -o match:"${TESTCASE}, skipped, .*/dont-exist" \ - -e ignore atf-run -v files="$(pwd)/i-exist $(pwd)/dont-exist" helper - - echo "Checking that relative paths are not allowed" - atf_check -s eq:1 \ - -o match:"${TESTCASE}, failed, Relative paths.*not allowed.*hello" \ - -e ignore atf-run -v files='hello' helper - atf_check -s eq:1 \ - -o match:"${TESTCASE}, failed, Relative paths.*not allowed.*a/b" \ - -e ignore atf-run -v files='a/b' helper -} - -atf_test_case require_machine -require_machine_head() -{ - atf_set "descr" "Tests that atf-run validates the require.machine property" -} -require_machine_body() -{ - create_helper require_machine - create_atffile helper - - echo "Checking for the real machine type" - machine=$(atf-config -t atf_machine) - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v machine="${machine}" helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v machine="foo ${machine}" helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v machine="${machine} foo" helper - - echo "Checking for a fictitious machine type" - machine=fictitious - export ATF_MACHINE=fictitious - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v machine="${machine}" helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v machine="foo ${machine}" helper - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v machine="${machine} foo" helper - - echo "Triggering some failures" - atf_check -s eq:0 -o match:"${TESTCASE}, skipped, .*foo.*machine type" \ - -e ignore atf-run -v machine="foo" helper - atf_check -s eq:0 \ - -o match:"${TESTCASE}, skipped, .*foo bar.*machine types" -e ignore \ - atf-run -v machine="foo bar" helper - atf_check -s eq:0 \ - -o match:"${TESTCASE}, skipped, .*fictitiousxxx.*machine type" \ - -e ignore atf-run -v machine="${machine}xxx" helper -} - -atf_test_case require_progs -require_progs_head() -{ - atf_set "descr" "Tests that atf-run validates the require.progs property" -} -require_progs_body() -{ - create_helper require_progs - create_atffile helper - - echo "Checking absolute paths" - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v progs='/bin/cp' helper - atf_check -s eq:0 \ - -o match:"${TESTCASE}, skipped, .*/bin/__non-existent__.*PATH" \ - -e ignore atf-run -v progs='/bin/__non-existent__' helper - - echo "Checking that relative paths are not allowed" - atf_check -s eq:1 \ - -o match:"${TESTCASE}, failed, Relative paths.*not allowed.*bin/cp" \ - -e ignore atf-run -v progs='bin/cp' helper - - echo "Check plain file names, searching them in the PATH." - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v progs='cp' helper - atf_check -s eq:0 \ - -o match:"${TESTCASE}, skipped, .*__non-existent__.*PATH" -e ignore \ - atf-run -v progs='__non-existent__' helper -} - -atf_test_case require_user_root -require_user_root_head() -{ - atf_set "descr" "Tests that atf-run validates the require.user property" \ - "when it is set to 'root'" -} -require_user_root_body() -{ - create_helper require_user - create_atffile helper - - if [ $(id -u) -eq 0 ]; then - exp=passed - else - exp=skipped - fi - atf_check -s eq:0 -o match:"${TESTCASE}, ${exp}" -e ignore atf-run \ - -v user=root helper -} - -atf_test_case require_user_unprivileged -require_user_unprivileged_head() -{ - atf_set "descr" "Tests that atf-run validates the require.user property" \ - "when it is set to 'root'" -} -require_user_unprivileged_body() -{ - create_helper require_user - create_atffile helper - - if [ $(id -u) -eq 0 ]; then - exp=skipped - else - exp=passed - fi - atf_check -s eq:0 -o match:"${TESTCASE}, ${exp}" -e ignore atf-run \ - -v user=unprivileged helper -} - -atf_test_case require_user_bad -require_user_bad_head() -{ - atf_set "descr" "Tests that atf-run validates the require.user property" \ - "when it is set to 'root'" -} -require_user_bad_body() -{ - create_helper require_user - create_atffile helper - - atf_check -s eq:1 -o match:"${TESTCASE}, failed, Invalid value.*foobar" \ - -e ignore atf-run -v user=foobar helper -} - -atf_test_case timeout -timeout_head() -{ - atf_set "descr" "Tests that atf-run kills a test case that times out" -} -timeout_body() -{ - create_helper timeout - create_atffile helper - - atf_check -s eq:1 \ - -o match:"${TESTCASE}, failed, .*timed out after 1 second" -e ignore \ - atf-run -v statedir=$(pwd) helper - if [ -f finished ]; then - atf_fail "Test case was not killed after time out" - fi -} - -atf_test_case timeout_forkexit -timeout_forkexit_head() -{ - atf_set "descr" "Tests that atf-run deals gracefully with a test program" \ - "that forks, exits, but the child process hangs" -} -timeout_forkexit_body() -{ - create_helper timeout_forkexit - create_atffile helper - - atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \ - -v statedir=$(pwd) helper - test -f parent-finished || atf_fail "Parent did not exit as expected" - test -f child-finished && atf_fail "Subprocess exited but it should have" \ - "been forcibly terminated" || true -} - -atf_test_case ignore_deprecated_use_fs -ignore_deprecated_use_fs_head() -{ - atf_set "descr" "Tests that atf-run ignores the deprecated use.fs property" -} -ignore_deprecated_use_fs_body() -{ - create_helper use_fs - create_atffile helper - - atf_check -s eq:0 -o ignore -e ignore atf-run helper -} - -atf_init_test_cases() -{ - atf_add_test_case no_warnings - atf_add_test_case config - atf_add_test_case vflag - atf_add_test_case atffile - atf_add_test_case atffile_recursive - atf_add_test_case expect - atf_add_test_case fds - atf_add_test_case mux_streams - atf_add_test_case missing_results - atf_add_test_case broken_results - atf_add_test_case broken_tp_list - atf_add_test_case zero_tcs - atf_add_test_case exit_codes - atf_add_test_case signaled - atf_add_test_case hooks - atf_add_test_case isolation_env - atf_add_test_case isolation_home - atf_add_test_case isolation_stdin - atf_add_test_case isolation_umask - atf_add_test_case cleanup_pass - atf_add_test_case cleanup_fail - atf_add_test_case cleanup_skip - atf_add_test_case cleanup_curdir - atf_add_test_case cleanup_signal - atf_add_test_case cleanup_mount - atf_add_test_case cleanup_symlink - atf_add_test_case require_arch - atf_add_test_case require_config - atf_add_test_case require_files - atf_add_test_case require_machine - atf_add_test_case require_progs - atf_add_test_case require_user_root - atf_add_test_case require_user_unprivileged - atf_add_test_case require_user_bad - atf_add_test_case timeout - atf_add_test_case timeout_forkexit - atf_add_test_case ignore_deprecated_use_fs -} - -# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 diff --git a/tools/atf-version.1 b/tools/atf-version.1 deleted file mode 100644 index 136f13cd463d..000000000000 --- a/tools/atf-version.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" -.\" Automated Testing Framework (atf) -.\" -.\" Copyright (c) 2007 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd September 16, 2007 -.Dt ATF-VERSION 1 -.Os -.Sh NAME -.Nm atf-version -.Nd shows information about the installed ATF version -.Sh SYNOPSIS -.Nm -.Nm -.Fl h -.Sh DESCRIPTION -.Nm -is a utility that prints information about the version of ATF currently -installed in the system. -.Pp -In the first synopsis form, -.Nm -shows the release version of the ATF package installed in the system (the -installation that corresponds to the instance of -.Nm -being executed) and also shows information related to the repository -revision used to build that package. -.Pp -In the second synopsis form, -.Nm -will print information about all supported options and their purpose. -.Sh SEE ALSO -.Xr atf 7 diff --git a/tools/atf-version.cpp b/tools/atf-version.cpp deleted file mode 100644 index 0a13e7ecd99e..000000000000 --- a/tools/atf-version.cpp +++ /dev/null @@ -1,91 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(HAVE_CONFIG_H) -#include "bconfig.h" -#endif - -#include -#include - -#include "application.hpp" -#include "revision.h" -#include "ui.hpp" - -class atf_version : public tools::application::app { - static const char* m_description; - -public: - atf_version(void); - - int main(void); -}; - -const char* atf_version::m_description = - "atf-version is a tool that shows information about the currently " - "installed version of ATF."; - -atf_version::atf_version(void) : - app(m_description, "atf-version(1)", "atf(7)") -{ -} - -int -atf_version::main(void) -{ - using tools::ui::format_text; - using tools::ui::format_text_with_tag; - - std::cout << PACKAGE_STRING " (" PACKAGE_TARNAME "-" PACKAGE_VERSION - ")\n" PACKAGE_COPYRIGHT "\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 - - return EXIT_SUCCESS; -} - -int -main(int argc, char* const* argv) -{ - return atf_version().run(argc, argv); -} diff --git a/tools/atf.7.in b/tools/atf.7.in deleted file mode 100644 index b11054cc4779..000000000000 --- a/tools/atf.7.in +++ /dev/null @@ -1,192 +0,0 @@ -.\" -.\" Automated Testing Framework (atf) -.\" -.\" Copyright (c) 2007 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd August 28, 2010 -.Dt ATF 7 -.Os -.Sh NAME -.Nm ATF -.Nd introduction to the Automated Testing Framework -.Sh DESCRIPTION -.Em IMPORTANT: If you are here because you want to know how to run the tests in -.Pa __TESTSDIR__ , -.Em you most likely want to read the -.Xr tests 7 -.Em manual page instead. -.Pp -The Automated Testing Framework -.Pf ( Nm ) -is a collection of libraries and utilities designed to ease unattended -application testing in the hands of developers and end users of a specific -piece of software. -.Pp -As regards developers, -.Nm -provides the necessary means to easily create -test suites composed of multiple test programs, which in turn are a -collection of test cases. -It also attempts to simplify the debugging of problems when these test -cases detect an error by providing as much information as possible -about the failure. -.Pp -As regards users, it simplifies the process of running the test suites and, -in special, encourages end users to run them often: they do not need to -have source trees around nor any other development tools installed to be -able to certify that a given piece of software works on their machine as -advertised. -.Pp -If your operating systems distributes -.Nm , -it is possible that it provides an introductory -.Xr tests 7 -manual page. -You are encouraged to read it now. -.Ss License -.Nm -is distributed under the terms of the TNF License, a 2-clause BSD license. -For more details please see: -.Bd -literal -offset indent -.Pa __DOCDIR__/COPYING -.Ed -.Ss Components -.Nm -is a highly modular piece of software. -It provides a couple of libraries to ease the implementation of test -programs: one for the C and C++ languages and another one for shell -scripts. -It also includes multiple small utilities that follow the principle of -doing a single thing but doing it right. -This section outlines which these components are. -.Pp -Public utilities: -.Bl -tag -width atfXtestXprogramXXXXX -.It Xr atf-check 1 -Executes a command and checks that its exit code, its standard output -and its standard error output match pre-specified expected values. -.It Xr atf-config 1 -Queries static configuration information. -.It Xr atf-report 1 -Converts the output of -.Nm atf-run -to user-friendly and/or machine-parseable reports. -.It Xr atf-run 1 -Automates the execution of a series of test programs and collects their -results in a unified report. -.It Xr atf-sh 1 -Shell interpreter for shell-based test programs. -.El -.Pp -Programming interfaces: -.Bl -tag -width atfXtestXprogramXXXXX -.It Xr atf-c-api 3 -C programming interface for test programs. -.It Xr atf-c++-api 3 -C++ programming interface for test programs. -.It Xr atf-sh-api 3 -POSIX shell programming interface for test programs. -.El -.Pp -Other: -.Bl -tag -width atfXtestXprogramXXXXX -.It Xr atf-formats 5 -Description of the machine-parseable data formats used by the tools. -.It Xr atf-test-case 4 -Generic description of test cases, independent of the language they are -implemented in. -.It Xr atf-test-program 1 -Common interface provided by the test programs written using the -.Nm -libraries. -.El -.Ss Recommended reading order -For end users wishing to run tests: -.Bl -enum -compact -.It -.Xr tests 7 -(only if provided by your operating system). -.It -.Xr atf-test-program 1 -.It -.Xr atf-run 1 -.It -.Xr atf-report 1 -.It -.Xr atf-config 1 -.El -.Pp -For developers wanting to write their own tests: -.Bl -enum -compact -.It -Everything recommended to users. -.It -.Xr atf-test-case 4 -.It -.Xr atf-c-api 3 -.It -.Xr atf-c++-api 3 -.It -.Xr atf-sh-api 3 -.It -.Xr atf-sh 1 -.It -.Xr atf-check 1 -.El -.Pp -For those interested in -.Nm -internals: -.Bl -enum -compact -.It -Everything recommended to users. -.It -Everything recommended to developers. -.It -.Xr atf-formats 5 -.El -.Sh SEE ALSO -.Xr tests 7 -.Sh HISTORY -.Nm -started as a Google Summer of Code 2007 project mentored by The NetBSD -Foundation. -Its original goal was to provide a testing framework for The NetBSD -Operating System, but it grew as an independent project because the -framework itself did not need to be tied to a specific operating system. -.Pp -For more details on this subject, please see: -.Bd -literal -offset indent -.Pa __DOCDIR__/NEWS -.Pa __DOCDIR__/ROADMAP -.Ed -.Sh AUTHORS -For more details on the people that made -.Nm -possible, please see: -.Bd -literal -offset indent -.Pa __DOCDIR__/AUTHORS -.Ed diff --git a/tools/atffile.cpp b/tools/atffile.cpp deleted file mode 100644 index b04c59ed3bc0..000000000000 --- a/tools/atffile.cpp +++ /dev/null @@ -1,348 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include -#include - -#include "atffile.hpp" -#include "defs.hpp" -#include "exceptions.hpp" -#include "expand.hpp" -#include "parser.hpp" - -namespace impl = tools; -namespace detail = tools::detail; - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -} // anonymous namespace - -// ------------------------------------------------------------------------ -// The "atf_atffile" auxiliary parser. -// ------------------------------------------------------------------------ - -namespace atf_atffile { - -static const tools::parser::token_type eof_type = 0; -static const tools::parser::token_type nl_type = 1; -static const tools::parser::token_type text_type = 2; -static const tools::parser::token_type colon_type = 3; -static const tools::parser::token_type conf_type = 4; -static const tools::parser::token_type dblquote_type = 5; -static const tools::parser::token_type equal_type = 6; -static const tools::parser::token_type hash_type = 7; -static const tools::parser::token_type prop_type = 8; -static const tools::parser::token_type tp_type = 9; -static const tools::parser::token_type tp_glob_type = 10; - -class tokenizer : public tools::parser::tokenizer< std::istream > { -public: - tokenizer(std::istream& is, size_t curline) : - tools::parser::tokenizer< std::istream > - (is, true, eof_type, nl_type, text_type, curline) - { - add_delim(':', colon_type); - add_delim('=', equal_type); - add_delim('#', hash_type); - add_quote('"', dblquote_type); - add_keyword("conf", conf_type); - add_keyword("prop", prop_type); - add_keyword("tp", tp_type); - add_keyword("tp-glob", tp_glob_type); - } -}; - -} // namespace atf_atffile - -// ------------------------------------------------------------------------ -// The "atf_atffile_reader" class. -// ------------------------------------------------------------------------ - -detail::atf_atffile_reader::atf_atffile_reader(std::istream& is) : - m_is(is) -{ -} - -detail::atf_atffile_reader::~atf_atffile_reader(void) -{ -} - -void -detail::atf_atffile_reader::got_conf( - const std::string& name ATF_DEFS_ATTRIBUTE_UNUSED, - const std::string& val ATF_DEFS_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) -{ -} - -void -detail::atf_atffile_reader::got_tp( - const std::string& name ATF_DEFS_ATTRIBUTE_UNUSED, - bool isglob ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -detail::atf_atffile_reader::got_eof(void) -{ -} - -void -detail::atf_atffile_reader::read(void) -{ - using tools::parser::parse_error; - using namespace atf_atffile; - - std::pair< size_t, tools::parser::headers_map > hml = - tools::parser::read_headers(m_is, 1); - tools::parser::validate_content_type(hml.second, - "application/X-atf-atffile", 1); - - tokenizer tkz(m_is, hml.first); - tools::parser::parser< tokenizer > p(tkz); - - for (;;) { - try { - tools::parser::token t = - p.expect(conf_type, hash_type, prop_type, tp_type, - tp_glob_type, nl_type, eof_type, - "conf, #, prop, tp, tp-glob, a new line or eof"); - if (t.type() == eof_type) - break; - - if (t.type() == conf_type) { - t = p.expect(colon_type, "`:'"); - - t = p.expect(text_type, "variable name"); - std::string var = t.text(); - - t = p.expect(equal_type, "equal sign"); - - t = p.expect(text_type, "word or quoted string"); - ATF_PARSER_CALLBACK(p, got_conf(var, t.text())); - } else if (t.type() == hash_type) { - (void)p.rest_of_line(); - } else if (t.type() == prop_type) { - t = p.expect(colon_type, "`:'"); - - t = p.expect(text_type, "property name"); - std::string name = t.text(); - - t = p.expect(equal_type, "equale sign"); - - t = p.expect(text_type, "word or quoted string"); - ATF_PARSER_CALLBACK(p, got_prop(name, t.text())); - } else if (t.type() == tp_type) { - t = p.expect(colon_type, "`:'"); - - t = p.expect(text_type, "word or quoted string"); - ATF_PARSER_CALLBACK(p, got_tp(t.text(), false)); - } else if (t.type() == tp_glob_type) { - t = p.expect(colon_type, "`:'"); - - t = p.expect(text_type, "word or quoted string"); - ATF_PARSER_CALLBACK(p, got_tp(t.text(), true)); - } else if (t.type() == nl_type) { - continue; - } else - std::abort(); - - t = p.expect(nl_type, hash_type, eof_type, - "new line or comment"); - if (t.type() == hash_type) { - (void)p.rest_of_line(); - t = p.next(); - } else if (t.type() == eof_type) - break; - } catch (const parse_error& pe) { - p.add_error(pe); - p.reset(nl_type); - } - } - - ATF_PARSER_CALLBACK(p, got_eof()); -} - -// ------------------------------------------------------------------------ -// The "reader" helper class. -// ------------------------------------------------------------------------ - -class reader : public detail::atf_atffile_reader { - const tools::fs::directory& m_dir; - vars_map m_conf, m_props; - std::vector< std::string > m_tps; - - void - got_tp(const std::string& name, bool isglob) - { - if (isglob) { - std::vector< std::string > ms = - tools::expand::expand_glob(name, m_dir.names()); - // Cannot use m_tps.insert(iterator, begin, end) here because it - // does not work under Solaris. - for (std::vector< std::string >::const_iterator iter = ms.begin(); - iter != ms.end(); iter++) - m_tps.push_back(*iter); - } else { - if (m_dir.find(name) == m_dir.end()) - throw tools::not_found_error< tools::fs::path > - ("Cannot locate the " + name + " file", - tools::fs::path(name)); - m_tps.push_back(name); - } - } - - void - got_prop(const std::string& name, const std::string& val) - { - m_props[name] = val; - } - - void - got_conf(const std::string& var, const std::string& val) - { - m_conf[var] = val; - } - -public: - reader(std::istream& is, const tools::fs::directory& dir) : - detail::atf_atffile_reader(is), - m_dir(dir) - { - } - - const vars_map& - conf(void) - const - { - return m_conf; - } - - const vars_map& - props(void) - const - { - return m_props; - } - - const std::vector< std::string >& - tps(void) - const - { - return m_tps; - } -}; - -// ------------------------------------------------------------------------ -// The "atffile" class. -// ------------------------------------------------------------------------ - -impl::atffile::atffile(const vars_map& config_vars, - const std::vector< std::string >& test_program_names, - const vars_map& properties) : - m_conf(config_vars), - m_tps(test_program_names), - m_props(properties) -{ - assert(properties.find("test-suite") != properties.end()); -} - -const std::vector< std::string >& -impl::atffile::tps(void) - const -{ - return m_tps; -} - -const vars_map& -impl::atffile::conf(void) - const -{ - return m_conf; -} - -const vars_map& -impl::atffile::props(void) - const -{ - return m_props; -} - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -// XXX Glob expansion and file existance checks certainly do not belong in -// a *parser*. This needs to be taken out... -impl::atffile -impl::read_atffile(const tools::fs::path& filename) -{ - // Scan the directory where the atffile lives in to gather a list of - // all possible test programs in it. - tools::fs::directory dir(filename.branch_path()); - dir.erase(filename.leaf_name()); - tools::fs::directory::iterator iter = dir.begin(); - while (iter != dir.end()) { - const std::string& name = (*iter).first; - const tools::fs::file_info& fi = (*iter).second; - - // Discard hidden files and non-executable ones so that they are - // not candidates for glob matching. - if (name[0] == '.' || (!fi.is_owner_executable() && - !fi.is_group_executable())) - dir.erase(iter++); - else - iter++; - } - - // Parse the atffile. - std::ifstream is(filename.c_str()); - if (!is) - throw tools::not_found_error< tools::fs::path > - ("Cannot open Atffile", filename); - reader r(is, dir); - r.read(); - is.close(); - - // Sanity checks. - if (r.props().find("test-suite") == r.props().end()) - throw tools::not_found_error< std::string > - ("Undefined property `test-suite'", "test-suite"); - - return atffile(r.conf(), r.tps(), r.props()); -} diff --git a/tools/atffile.hpp b/tools/atffile.hpp deleted file mode 100644 index f326b241d7f0..000000000000 --- a/tools/atffile.hpp +++ /dev/null @@ -1,92 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_ATFFILE_HPP) -#define TOOLS_ATFFILE_HPP - -#include -#include -#include - -#include "fs.hpp" - -namespace tools { - -// ------------------------------------------------------------------------ -// The "atf_atffile_reader" class. -// ------------------------------------------------------------------------ - -namespace detail { - -class atf_atffile_reader { - std::istream& m_is; - -protected: - virtual void got_conf(const std::string&, const std::string &); - virtual void got_prop(const std::string&, const std::string &); - virtual void got_tp(const std::string&, bool); - virtual void got_eof(void); - -public: - atf_atffile_reader(std::istream&); - virtual ~atf_atffile_reader(void); - - void read(void); -}; - -} // namespace detail - -// ------------------------------------------------------------------------ -// The "atffile" class. -// ------------------------------------------------------------------------ - -class atffile { - std::map< std::string, std::string > m_conf; - std::vector< std::string > m_tps; - std::map< std::string, std::string > m_props; - -public: - atffile(const std::map< std::string, std::string >&, - const std::vector< std::string >&, - const std::map< std::string, std::string >&); - - const std::map< std::string, std::string >& conf(void) const; - const std::vector< std::string >& tps(void) const; - const std::map< std::string, std::string >& props(void) const; -}; - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -atffile read_atffile(const tools::fs::path&); - -} // namespace tools - -#endif // !defined(TOOLS_ATFFILE_HPP) diff --git a/tools/atffile_test.cpp b/tools/atffile_test.cpp deleted file mode 100644 index cb358dfa8b9f..000000000000 --- a/tools/atffile_test.cpp +++ /dev/null @@ -1,636 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2009 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include -} - -#include -#include -#include - -#include - -#include "atffile.hpp" -#include "exceptions.hpp" -#include "test_helpers.hpp" - -namespace detail = tools::detail; - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -static -std::auto_ptr< std::ofstream > -new_atffile(void) -{ - std::auto_ptr< std::ofstream > os(new std::ofstream("Atffile")); - ATF_REQUIRE(*os); - - (*os) << "Content-Type: application/X-atf-atffile; version=\"1\"\n\n"; - return os; -} - -static -void -touch_exec(const char* name) -{ - std::ofstream os(name); - ATF_REQUIRE(os); - os.close(); - ATF_REQUIRE(::chmod(name, S_IRWXU) != -1); -} - -static inline -bool -is_in(const std::string& value, const std::vector< std::string >& v) -{ - return std::find(v.begin(), v.end(), value) != v.end(); -} - -} // anonymous namespace - -// ------------------------------------------------------------------------ -// Tests cases for the "atffile" parser. -// ------------------------------------------------------------------------ - -class atffile_reader : protected detail::atf_atffile_reader { - void - got_conf(const std::string& name, const std::string& val) - { - m_calls.push_back("got_conf(" + name + ", " + val + ")"); - } - - void - got_prop(const std::string& name, const std::string& val) - { - m_calls.push_back("got_prop(" + name + ", " + val + ")"); - } - - void - got_tp(const std::string& name, bool isglob) - { - m_calls.push_back("got_tp(" + name + ", " + (isglob ? "true" : "false") - + ")"); - } - - void - got_eof(void) - { - m_calls.push_back("got_eof()"); - } - -public: - atffile_reader(std::istream& is) : - detail::atf_atffile_reader(is) - { - } - - void - read(void) - { - atf_atffile_reader::read(); - } - - std::vector< std::string > m_calls; -}; - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_1); -ATF_TEST_CASE_BODY(atffile_1) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - ; - - const char* exp_calls[] = { - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_2); -ATF_TEST_CASE_BODY(atffile_2) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "# This is a comment on a line of its own.\n" - "# And this is another one.\n" - "\n" - " # Another after some whitespace.\n" - "\n" - "# The last one after an empty line.\n" - ; - - const char* exp_calls[] = { - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_3); -ATF_TEST_CASE_BODY(atffile_3) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "conf: var1=value1\n" - "conf: var2 = value2\n" - "conf: var3 = value3\n" - "conf: var4 = value4\n" - "\n" - "conf:var5=value5\n" - " conf:var6=value6\n" - "\n" - "conf: var7 = \"This is a long value.\"\n" - "conf: var8 = \"Single-word\"\n" - "conf: var9 = \" Single-word \"\n" - "conf: var10 = Single-word\n" - ; - - const char* exp_calls[] = { - "got_conf(var1, value1)", - "got_conf(var2, value2)", - "got_conf(var3, value3)", - "got_conf(var4, value4)", - "got_conf(var5, value5)", - "got_conf(var6, value6)", - "got_conf(var7, This is a long value.)", - "got_conf(var8, Single-word)", - "got_conf(var9, Single-word )", - "got_conf(var10, Single-word)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_4); -ATF_TEST_CASE_BODY(atffile_4) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "prop: var1=value1\n" - "prop: var2 = value2\n" - "prop: var3 = value3\n" - "prop: var4 = value4\n" - "\n" - "prop:var5=value5\n" - " prop:var6=value6\n" - "\n" - "prop: var7 = \"This is a long value.\"\n" - "prop: var8 = \"Single-word\"\n" - "prop: var9 = \" Single-word \"\n" - "prop: var10 = Single-word\n" - ; - - const char* exp_calls[] = { - "got_prop(var1, value1)", - "got_prop(var2, value2)", - "got_prop(var3, value3)", - "got_prop(var4, value4)", - "got_prop(var5, value5)", - "got_prop(var6, value6)", - "got_prop(var7, This is a long value.)", - "got_prop(var8, Single-word)", - "got_prop(var9, Single-word )", - "got_prop(var10, Single-word)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_5); -ATF_TEST_CASE_BODY(atffile_5) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "tp:foo\n" - "tp: foo\n" - "tp: foo\n" - "tp: foo\n" - "tp: foo\n" - "tp: \"name with spaces\"\n" - "tp: \"single-word\"\n" - "tp: single-word\n" - "\n" - "tp-glob:foo*?bar\n" - "tp-glob: foo*?bar\n" - "tp-glob: foo*?bar\n" - "tp-glob: foo*?bar\n" - "tp-glob: foo*?bar\n" - "tp-glob: \"glob * with ? spaces\"\n" - "tp-glob: \"single-*-word\"\n" - "tp-glob: single-*-word\n" - ; - - const char* exp_calls[] = { - "got_tp(foo, false)", - "got_tp(foo, false)", - "got_tp(foo, false)", - "got_tp(foo, false)", - "got_tp(foo, false)", - "got_tp(name with spaces, false)", - "got_tp(single-word, false)", - "got_tp(single-word, false)", - "got_tp(foo*?bar, true)", - "got_tp(foo*?bar, true)", - "got_tp(foo*?bar, true)", - "got_tp(foo*?bar, true)", - "got_tp(foo*?bar, true)", - "got_tp(glob * with ? spaces, true)", - "got_tp(single-*-word, true)", - "got_tp(single-*-word, true)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_6); -ATF_TEST_CASE_BODY(atffile_6) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "prop: foo = bar # A comment.\n" - "conf: foo = bar # A comment.\n" - "tp: foo # A comment.\n" - "tp-glob: foo # A comment.\n" - ; - - const char* exp_calls[] = { - "got_prop(foo, bar)", - "got_conf(foo, bar)", - "got_tp(foo, false)", - "got_tp(foo, true)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_50); -ATF_TEST_CASE_BODY(atffile_50) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "foo\n" - ; - - const char* exp_calls[] = { - NULL - }; - - // NO_CHECK_STYLE_BEGIN - const char* exp_errors[] = { - "3: Unexpected token `foo'; expected conf, #, prop, tp, tp-glob, a new line or eof", - NULL - }; - // NO_CHECK_STYLE_END - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_51); -ATF_TEST_CASE_BODY(atffile_51) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "foo bar\n" - "baz\n" - ; - - const char* exp_calls[] = { - NULL - }; - - // NO_CHECK_STYLE_BEGIN - const char* exp_errors[] = { - "3: Unexpected token `foo'; expected conf, #, prop, tp, tp-glob, a new line or eof", - "4: Unexpected token `baz'; expected conf, #, prop, tp, tp-glob, a new line or eof", - NULL - }; - // NO_CHECK_STYLE_END - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_52); -ATF_TEST_CASE_BODY(atffile_52) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "conf\n" - "conf:\n" - "conf: foo =\n" - "conf: bar = # A comment.\n" - "\n" - "prop\n" - "prop:\n" - "prop: foo =\n" - "prop: bar = # A comment.\n" - "\n" - "tp\n" - "tp:\n" - "tp: # A comment.\n" - "\n" - "tp-glob\n" - "tp-glob:\n" - "tp-glob: # A comment.\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected `:'", - "4: Unexpected token `<>'; expected variable name", - "5: Unexpected token `<>'; expected word or quoted string", - "6: Unexpected token `#'; expected word or quoted string", - "8: Unexpected token `<>'; expected `:'", - "9: Unexpected token `<>'; expected property name", - "10: Unexpected token `<>'; expected word or quoted string", - "11: Unexpected token `#'; expected word or quoted string", - "13: Unexpected token `<>'; expected `:'", - "14: Unexpected token `<>'; expected word or quoted string", - "15: Unexpected token `#'; expected word or quoted string", - "17: Unexpected token `<>'; expected `:'", - "18: Unexpected token `<>'; expected word or quoted string", - "19: Unexpected token `#'; expected word or quoted string", - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_53); -ATF_TEST_CASE_BODY(atffile_53) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "prop: foo = \"Correct value\" # With comment.\n" - "\n" - "prop: bar = # A comment.\n" - "\n" - "prop: baz = \"Last variable\"\n" - "\n" - "# End of file.\n" - ; - - const char* exp_calls[] = { - "got_prop(foo, Correct value)", - NULL - }; - - const char* exp_errors[] = { - "5: Unexpected token `#'; expected word or quoted string", - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(atffile_54); -ATF_TEST_CASE_BODY(atffile_54) -{ - const char* input = - "Content-Type: application/X-atf-atffile; version=\"1\"\n" - "\n" - "prop: foo = \"\n" - "prop: bar = \"text\n" - "prop: baz = \"te\\\"xt\n" - "prop: last = \"\\\"\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Missing double quotes before end of line", - "4: Missing double quotes before end of line", - "5: Missing double quotes before end of line", - "6: Missing double quotes before end of line", - NULL - }; - - do_parser_test< atffile_reader >(input, exp_calls, exp_errors); -} - -// ------------------------------------------------------------------------ -// Tests cases for the "atffile" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(atffile_getters); -ATF_TEST_CASE_HEAD(atffile_getters) {} -ATF_TEST_CASE_BODY(atffile_getters) { - vars_map config_vars; - config_vars["config-var-1"] = "value 1"; - - std::vector< std::string > test_program_names; - test_program_names.push_back("test-program-1"); - - vars_map properties; - properties["test-suite"] = "a test name"; - - const tools::atffile atffile(config_vars, test_program_names, properties); - ATF_REQUIRE(config_vars == atffile.conf()); - ATF_REQUIRE(test_program_names == atffile.tps()); - ATF_REQUIRE(properties == atffile.props()); -} - -// ------------------------------------------------------------------------ -// Tests cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE_WITHOUT_HEAD(read_ok_simple); -ATF_TEST_CASE_BODY(read_ok_simple) { - std::auto_ptr< std::ofstream > os = new_atffile(); - (*os) << "prop: test-suite = foo\n"; - (*os) << "tp: tp-1\n"; - (*os) << "conf: var1 = value1\n"; - (*os) << "tp: tp-2\n"; - (*os) << "tp: tp-3\n"; - (*os) << "prop: prop1 = propvalue1\n"; - (*os) << "conf: var2 = value2\n"; - (*os).close(); - - touch_exec("tp-1"); - touch_exec("tp-2"); - touch_exec("tp-3"); - - const tools::atffile atffile = tools::read_atffile( - tools::fs::path("Atffile")); - ATF_REQUIRE_EQ(2, atffile.conf().size()); - ATF_REQUIRE_EQ("value1", atffile.conf().find("var1")->second); - ATF_REQUIRE_EQ("value2", atffile.conf().find("var2")->second); - ATF_REQUIRE_EQ(3, atffile.tps().size()); - ATF_REQUIRE(is_in("tp-1", atffile.tps())); - ATF_REQUIRE(is_in("tp-2", atffile.tps())); - ATF_REQUIRE(is_in("tp-3", atffile.tps())); - ATF_REQUIRE_EQ(2, atffile.props().size()); - ATF_REQUIRE_EQ("foo", atffile.props().find("test-suite")->second); - ATF_REQUIRE_EQ("propvalue1", atffile.props().find("prop1")->second); -} - -ATF_TEST_CASE_WITHOUT_HEAD(read_ok_some_globs); -ATF_TEST_CASE_BODY(read_ok_some_globs) { - std::auto_ptr< std::ofstream > os = new_atffile(); - (*os) << "prop: test-suite = foo\n"; - (*os) << "tp: foo\n"; - (*os) << "tp-glob: *K*\n"; - (*os) << "tp: bar\n"; - (*os) << "tp-glob: t_*\n"; - (*os).close(); - - touch_exec("foo"); - touch_exec("bar"); - touch_exec("aK"); - touch_exec("KKKKK"); - touch_exec("t_hello"); - touch_exec("zzzt_hello"); - - const tools::atffile atffile = tools::read_atffile( - tools::fs::path("Atffile")); - ATF_REQUIRE_EQ(5, atffile.tps().size()); - ATF_REQUIRE(is_in("foo", atffile.tps())); - ATF_REQUIRE(is_in("bar", atffile.tps())); - ATF_REQUIRE(is_in("aK", atffile.tps())); - ATF_REQUIRE(is_in("KKKKK", atffile.tps())); - ATF_REQUIRE(is_in("t_hello", atffile.tps())); -} - -ATF_TEST_CASE_WITHOUT_HEAD(read_missing_test_suite); -ATF_TEST_CASE_BODY(read_missing_test_suite) { - std::auto_ptr< std::ofstream > os = new_atffile(); - (*os).close(); - - try { - (void)tools::read_atffile(tools::fs::path("Atffile")); - ATF_FAIL("Missing property 'test-suite' did not raise an error"); - } catch (const tools::not_found_error< std::string >& e) { - ATF_REQUIRE_EQ("test-suite", e.get_value()); - } -} - -ATF_TEST_CASE_WITHOUT_HEAD(read_missing_test_program); -ATF_TEST_CASE_BODY(read_missing_test_program) { - std::auto_ptr< std::ofstream > os = new_atffile(); - (*os) << "tp: foo\n"; - (*os) << "tp: bar\n"; - (*os) << "tp: baz\n"; - (*os).close(); - - touch_exec("foo"); - touch_exec("baz"); - - try { - (void)tools::read_atffile(tools::fs::path("Atffile")); - ATF_FAIL("Missing file 'bar' did not raise an error"); - } catch (const tools::not_found_error< tools::fs::path >& e) { - ATF_REQUIRE_EQ("bar", e.get_value().str()); - } -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the test cases for the parser class. - ATF_ADD_TEST_CASE(tcs, atffile_1); - ATF_ADD_TEST_CASE(tcs, atffile_2); - ATF_ADD_TEST_CASE(tcs, atffile_3); - ATF_ADD_TEST_CASE(tcs, atffile_4); - ATF_ADD_TEST_CASE(tcs, atffile_5); - ATF_ADD_TEST_CASE(tcs, atffile_6); - ATF_ADD_TEST_CASE(tcs, atffile_50); - ATF_ADD_TEST_CASE(tcs, atffile_51); - ATF_ADD_TEST_CASE(tcs, atffile_52); - ATF_ADD_TEST_CASE(tcs, atffile_53); - ATF_ADD_TEST_CASE(tcs, atffile_54); - - // Add the test cases for the atffile class. - ATF_ADD_TEST_CASE(tcs, atffile_getters); - - // Add the test cases for the free functions. - ATF_ADD_TEST_CASE(tcs, read_ok_simple); - ATF_ADD_TEST_CASE(tcs, read_ok_some_globs); - ATF_ADD_TEST_CASE(tcs, read_missing_test_suite); - ATF_ADD_TEST_CASE(tcs, read_missing_test_program); -} diff --git a/tools/auto_array.hpp b/tools/auto_array.hpp deleted file mode 100644 index 773f875524fa..000000000000 --- a/tools/auto_array.hpp +++ /dev/null @@ -1,179 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_AUTO_ARRAY_HPP) -#define TOOLS_AUTO_ARRAY_HPP - -#include - -namespace tools { - -// ------------------------------------------------------------------------ -// The "auto_array" class. -// ------------------------------------------------------------------------ - -template< class T > -struct auto_array_ref { - T* m_ptr; - - explicit auto_array_ref(T*); -}; - -template< class T > -auto_array_ref< T >::auto_array_ref(T* ptr) : - m_ptr(ptr) -{ -} - -template< class T > -class auto_array { - T* m_ptr; - -public: - auto_array(T* = NULL) throw(); - auto_array(auto_array< T >&) throw(); - auto_array(auto_array_ref< T >) throw(); - ~auto_array(void) throw(); - - T* get(void) throw(); - const T* get(void) const throw(); - T* release(void) throw(); - void reset(T* = NULL) throw(); - - auto_array< T >& operator=(auto_array< T >&) throw(); - auto_array< T >& operator=(auto_array_ref< T >) throw(); - - T& operator[](int) throw(); - operator auto_array_ref< T >(void) throw(); -}; - -template< class T > -auto_array< T >::auto_array(T* ptr) - throw() : - m_ptr(ptr) -{ -} - -template< class T > -auto_array< T >::auto_array(auto_array< T >& ptr) - throw() : - m_ptr(ptr.release()) -{ -} - -template< class T > -auto_array< T >::auto_array(auto_array_ref< T > ref) - throw() : - m_ptr(ref.m_ptr) -{ -} - -template< class T > -auto_array< T >::~auto_array(void) - throw() -{ - if (m_ptr != NULL) - delete [] m_ptr; -} - -template< class T > -T* -auto_array< T >::get(void) - throw() -{ - return m_ptr; -} - -template< class T > -const T* -auto_array< T >::get(void) - const throw() -{ - return m_ptr; -} - -template< class T > -T* -auto_array< T >::release(void) - throw() -{ - T* ptr = m_ptr; - m_ptr = NULL; - return ptr; -} - -template< class T > -void -auto_array< T >::reset(T* ptr) - throw() -{ - if (m_ptr != NULL) - delete [] m_ptr; - m_ptr = ptr; -} - -template< class T > -auto_array< T >& -auto_array< T >::operator=(auto_array< T >& ptr) - throw() -{ - reset(ptr.release()); - return *this; -} - -template< class T > -auto_array< T >& -auto_array< T >::operator=(auto_array_ref< T > ref) - throw() -{ - if (m_ptr != ref.m_ptr) { - delete [] m_ptr; - m_ptr = ref.m_ptr; - } - return *this; -} - -template< class T > -T& -auto_array< T >::operator[](int pos) - throw() -{ - return m_ptr[pos]; -} - -template< class T > -auto_array< T >::operator auto_array_ref< T >(void) - throw() -{ - return auto_array_ref< T >(release()); -} - -} // namespace tools - -#endif // !defined(TOOLS_AUTO_ARRAY_HPP) diff --git a/tools/auto_array_test.cpp b/tools/auto_array_test.cpp deleted file mode 100644 index 56bbae536003..000000000000 --- a/tools/auto_array_test.cpp +++ /dev/null @@ -1,303 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -} - -#include - -#include - -#include "auto_array.hpp" -#include "defs.hpp" - -// ------------------------------------------------------------------------ -// Tests for the "auto_array" class. -// ------------------------------------------------------------------------ - -class test_array { -public: - int m_value; - - static ssize_t m_nblocks; - - static - tools::auto_array< test_array > - do_copy(tools::auto_array< test_array >& ta) - { - return tools::auto_array< test_array >(ta); - } - - void* operator new(size_t size ATF_DEFS_ATTRIBUTE_UNUSED) - { - ATF_FAIL("New called but should have been new[]"); - return new int(5); - } - - void* operator new[](size_t size) - { - m_nblocks++; - void* mem = ::operator new(size); - std::cout << "Allocated 'test_array' object " << mem << "\n"; - return mem; - } - - void operator delete(void* mem ATF_DEFS_ATTRIBUTE_UNUSED) - { - ATF_FAIL("Delete called but should have been delete[]"); - } - - void operator delete[](void* mem) - { - std::cout << "Releasing 'test_array' object " << mem << "\n"; - if (m_nblocks == 0) - ATF_FAIL("Unbalanced delete[]"); - m_nblocks--; - ::operator delete(mem); - } -}; - -ssize_t test_array::m_nblocks = 0; - -ATF_TEST_CASE(auto_array_scope); -ATF_TEST_CASE_HEAD(auto_array_scope) -{ - set_md_var("descr", "Tests the automatic scope handling in the " - "auto_array smart pointer class"); -} -ATF_TEST_CASE_BODY(auto_array_scope) -{ - using tools::auto_array; - - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - { - auto_array< test_array > t(new test_array[10]); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); -} - -ATF_TEST_CASE(auto_array_copy); -ATF_TEST_CASE_HEAD(auto_array_copy) -{ - set_md_var("descr", "Tests the auto_array smart pointer class' copy " - "constructor"); -} -ATF_TEST_CASE_BODY(auto_array_copy) -{ - using tools::auto_array; - - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - { - auto_array< test_array > t1(new test_array[10]); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - - { - auto_array< test_array > t2(t1); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); -} - -ATF_TEST_CASE(auto_array_copy_ref); -ATF_TEST_CASE_HEAD(auto_array_copy_ref) -{ - set_md_var("descr", "Tests the auto_array smart pointer class' copy " - "constructor through the auxiliary auto_array_ref object"); -} -ATF_TEST_CASE_BODY(auto_array_copy_ref) -{ - using tools::auto_array; - - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - { - auto_array< test_array > t1(new test_array[10]); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - - { - auto_array< test_array > t2 = test_array::do_copy(t1); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); -} - -ATF_TEST_CASE(auto_array_get); -ATF_TEST_CASE_HEAD(auto_array_get) -{ - set_md_var("descr", "Tests the auto_array smart pointer class' get " - "method"); -} -ATF_TEST_CASE_BODY(auto_array_get) -{ - using tools::auto_array; - - test_array* ta = new test_array[10]; - auto_array< test_array > t(ta); - ATF_REQUIRE_EQ(t.get(), ta); -} - -ATF_TEST_CASE(auto_array_release); -ATF_TEST_CASE_HEAD(auto_array_release) -{ - set_md_var("descr", "Tests the auto_array smart pointer class' release " - "method"); -} -ATF_TEST_CASE_BODY(auto_array_release) -{ - using tools::auto_array; - - test_array* ta1 = new test_array[10]; - { - auto_array< test_array > t(ta1); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - test_array* ta2 = t.release(); - ATF_REQUIRE_EQ(ta2, ta1); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - delete [] ta1; -} - -ATF_TEST_CASE(auto_array_reset); -ATF_TEST_CASE_HEAD(auto_array_reset) -{ - set_md_var("descr", "Tests the auto_array smart pointer class' reset " - "method"); -} -ATF_TEST_CASE_BODY(auto_array_reset) -{ - using tools::auto_array; - - test_array* ta1 = new test_array[10]; - test_array* ta2 = new test_array[10]; - ATF_REQUIRE_EQ(test_array::m_nblocks, 2); - - { - auto_array< test_array > t(ta1); - ATF_REQUIRE_EQ(test_array::m_nblocks, 2); - t.reset(ta2); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - t.reset(); - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); -} - -ATF_TEST_CASE(auto_array_assign); -ATF_TEST_CASE_HEAD(auto_array_assign) -{ - set_md_var("descr", "Tests the auto_array smart pointer class' " - "assignment operator"); -} -ATF_TEST_CASE_BODY(auto_array_assign) -{ - using tools::auto_array; - - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - { - auto_array< test_array > t1(new test_array[10]); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - - { - auto_array< test_array > t2; - t2 = t1; - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); -} - -ATF_TEST_CASE(auto_array_assign_ref); -ATF_TEST_CASE_HEAD(auto_array_assign_ref) -{ - set_md_var("descr", "Tests the auto_array smart pointer class' " - "assignment operator through the auxiliary auto_array_ref " - "object"); -} -ATF_TEST_CASE_BODY(auto_array_assign_ref) -{ - using tools::auto_array; - - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - { - auto_array< test_array > t1(new test_array[10]); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - - { - auto_array< test_array > t2; - t2 = test_array::do_copy(t1); - ATF_REQUIRE_EQ(test_array::m_nblocks, 1); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); - } - ATF_REQUIRE_EQ(test_array::m_nblocks, 0); -} - -ATF_TEST_CASE(auto_array_access); -ATF_TEST_CASE_HEAD(auto_array_access) -{ - set_md_var("descr", "Tests the auto_array smart pointer class' access " - "operator"); -} -ATF_TEST_CASE_BODY(auto_array_access) -{ - using tools::auto_array; - - auto_array< test_array > t(new test_array[10]); - - for (int i = 0; i < 10; i++) - t[i].m_value = i * 2; - - for (int i = 0; i < 10; i++) - ATF_REQUIRE_EQ(t[i].m_value, i * 2); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the test for the "auto_array" class. - ATF_ADD_TEST_CASE(tcs, auto_array_scope); - ATF_ADD_TEST_CASE(tcs, auto_array_copy); - ATF_ADD_TEST_CASE(tcs, auto_array_copy_ref); - ATF_ADD_TEST_CASE(tcs, auto_array_get); - ATF_ADD_TEST_CASE(tcs, auto_array_release); - ATF_ADD_TEST_CASE(tcs, auto_array_reset); - ATF_ADD_TEST_CASE(tcs, auto_array_assign); - ATF_ADD_TEST_CASE(tcs, auto_array_assign_ref); - ATF_ADD_TEST_CASE(tcs, auto_array_access); -} diff --git a/tools/bad_metadata_helper.c b/tools/bad_metadata_helper.c deleted file mode 100644 index 0f7fcb926acd..000000000000 --- a/tools/bad_metadata_helper.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Automated Testing Framework (atf) - * - * Copyright (c) 2010 The NetBSD Foundation, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include - -int -main(void) -{ - printf("incorrectly formatted metadata\n"); - return EXIT_SUCCESS; -} diff --git a/tools/config.cpp b/tools/config.cpp deleted file mode 100644 index 95bcf559933b..000000000000 --- a/tools/config.cpp +++ /dev/null @@ -1,135 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include - -#include "config.hpp" -#include "env.hpp" -#include "text.hpp" - -static std::map< std::string, std::string > m_variables; - -static struct var { - const char *name; - const char *default_value; - bool can_be_empty; -} vars[] = { - { "ATF_ARCH", ATF_ARCH, false, }, - { "ATF_BUILD_CC", ATF_BUILD_CC, false, }, - { "ATF_BUILD_CFLAGS", ATF_BUILD_CFLAGS, true, }, - { "ATF_BUILD_CPP", ATF_BUILD_CPP, false, }, - { "ATF_BUILD_CPPFLAGS", ATF_BUILD_CPPFLAGS, true, }, - { "ATF_BUILD_CXX", ATF_BUILD_CXX, false, }, - { "ATF_BUILD_CXXFLAGS", ATF_BUILD_CXXFLAGS, true, }, - { "ATF_CONFDIR", ATF_CONFDIR, false, }, - { "ATF_INCLUDEDIR", ATF_INCLUDEDIR, false, }, - { "ATF_LIBDIR", ATF_LIBDIR, false, }, - { "ATF_LIBEXECDIR", ATF_LIBEXECDIR, false, }, - { "ATF_MACHINE", ATF_MACHINE, false, }, - { "ATF_PKGDATADIR", ATF_PKGDATADIR, false, }, - { "ATF_SHELL", ATF_SHELL, false, }, - { "ATF_WORKDIR", ATF_WORKDIR, false, }, - { NULL, NULL, false, }, -}; - -// -// Adds all predefined standard build-time variables to the m_variables -// map, considering the values a user may have provided in the environment. -// -// Can only be called once during the program's lifetime. -// -static -void -init_variables(void) -{ - assert(m_variables.empty()); - - for (struct var* v = vars; v->name != NULL; v++) { - const std::string varname = tools::text::to_lower(v->name); - - if (tools::env::has(v->name)) { - const std::string envval = tools::env::get(v->name); - if (envval.empty() && !v->can_be_empty) - m_variables[varname] = v->default_value; - else - m_variables[varname] = envval; - } else { - m_variables[varname] = v->default_value; - } - } - - assert(!m_variables.empty()); -} - -const std::string& -tools::config::get(const std::string& varname) -{ - if (m_variables.empty()) - init_variables(); - - assert(has(varname)); - return m_variables[varname]; -} - -const std::map< std::string, std::string >& -tools::config::get_all(void) -{ - if (m_variables.empty()) - init_variables(); - - return m_variables; -} - -bool -tools::config::has(const std::string& varname) -{ - if (m_variables.empty()) - init_variables(); - - return m_variables.find(varname) != m_variables.end(); -} - -namespace tools { -namespace config { -// -// Auxiliary function for the t_config test program so that it can -// revert the configuration's global status to an empty state and -// do new tests from there on. -// -// Ideally this shouldn't be part of the production library... but -// this is so small that it does not matter. -// -void -__reinit(void) -{ - m_variables.clear(); -} -} // namespace config -} // namespace tools diff --git a/tools/config.hpp b/tools/config.hpp deleted file mode 100644 index 0a43873d7ba2..000000000000 --- a/tools/config.hpp +++ /dev/null @@ -1,75 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_CONFIG_HPP) -#define TOOLS_CONFIG_HPP - -#include -#include - -namespace tools { - -namespace config { - -//! -//! \brief Gets a build-time configuration variable's value. -//! -//! Given the name of a build-time configuration variable, returns its -//! textual value. The user is free to override these by setting their -//! corresponding environment variables. Therefore always use this -//! interface to get the value of these variables. -//! -//! \pre The variable must exist. -//! -const std::string& get(const std::string&); - -//! -//! \brief Returns all the build-time configuration variables. -//! -//! Returns a name to value map containing all build-time configuration -//! variables. -//! -const std::map< std::string, std::string >& get_all(void); - -//! -//! \brief Checks whether a build-time configuration variable exists. -//! -//! Given the name of a build-time configuration variable, checks -//! whether it is defined and returns a boolean indicating this -//! condition. The program only has to use this function to sanity-check -//! a variable name provided by the user. Otherwise it can assume that -//! the variables are defined. -//! -bool has(const std::string&); - -} // namespace config - -} // namespace tools - -#endif // !defined(TOOLS_CONFIG_HPP) diff --git a/tools/config_file.cpp b/tools/config_file.cpp deleted file mode 100644 index 3802c0679ed0..000000000000 --- a/tools/config_file.cpp +++ /dev/null @@ -1,223 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include -#include - -#include "config.hpp" -#include "config_file.hpp" -#include "defs.hpp" -#include "env.hpp" -#include "fs.hpp" -#include "parser.hpp" - -namespace impl = tools::config_file; -namespace detail = tools::config_file::detail; - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -namespace atf_config { - -static const tools::parser::token_type eof_type = 0; -static const tools::parser::token_type nl_type = 1; -static const tools::parser::token_type text_type = 2; -static const tools::parser::token_type dblquote_type = 3; -static const tools::parser::token_type equal_type = 4; -static const tools::parser::token_type hash_type = 5; - -class tokenizer : public tools::parser::tokenizer< std::istream > { -public: - tokenizer(std::istream& is, size_t curline) : - tools::parser::tokenizer< std::istream > - (is, true, eof_type, nl_type, text_type, curline) - { - add_delim('=', equal_type); - add_delim('#', hash_type); - add_quote('"', dblquote_type); - } -}; - -} // namespace atf_config - -class config_reader : public detail::atf_config_reader { - vars_map m_vars; - - void - got_var(const std::string& var, const std::string& name) - { - m_vars[var] = name; - } - -public: - config_reader(std::istream& is) : - atf_config_reader(is) - { - } - - const vars_map& - get_vars(void) - const - { - return m_vars; - } -}; - -template< class K, class V > -static -void -merge_maps(std::map< K, V >& dest, const std::map< K, V >& src) -{ - for (typename std::map< K, V >::const_iterator iter = src.begin(); - iter != src.end(); iter++) - dest[(*iter).first] = (*iter).second; -} - -static -void -merge_config_file(const tools::fs::path& config_path, - vars_map& config) -{ - std::ifstream is(config_path.c_str()); - if (is) { - config_reader reader(is); - reader.read(); - merge_maps(config, reader.get_vars()); - } -} - -static -std::vector< tools::fs::path > -get_config_dirs(void) -{ - std::vector< tools::fs::path > dirs; - dirs.push_back(tools::fs::path(tools::config::get("atf_confdir"))); - if (tools::env::has("HOME")) - dirs.push_back(tools::fs::path(tools::env::get("HOME")) / ".atf"); - return dirs; -} - -} // anonymous namespace - -detail::atf_config_reader::atf_config_reader(std::istream& is) : - m_is(is) -{ -} - -detail::atf_config_reader::~atf_config_reader(void) -{ -} - -void -detail::atf_config_reader::got_var( - const std::string& var ATF_DEFS_ATTRIBUTE_UNUSED, - const std::string& val ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -detail::atf_config_reader::got_eof(void) -{ -} - -void -detail::atf_config_reader::read(void) -{ - using tools::parser::parse_error; - using namespace atf_config; - - std::pair< size_t, tools::parser::headers_map > hml = - tools::parser::read_headers(m_is, 1); - tools::parser::validate_content_type(hml.second, - "application/X-atf-config", 1); - - tokenizer tkz(m_is, hml.first); - tools::parser::parser< tokenizer > p(tkz); - - for (;;) { - try { - tools::parser::token t = p.expect(eof_type, hash_type, text_type, - nl_type, - "eof, #, new line or text"); - if (t.type() == eof_type) - break; - - if (t.type() == hash_type) { - (void)p.rest_of_line(); - t = p.expect(nl_type, "new line"); - } else if (t.type() == text_type) { - std::string name = t.text(); - - t = p.expect(equal_type, "equal sign"); - - t = p.expect(text_type, "word or quoted string"); - ATF_PARSER_CALLBACK(p, got_var(name, t.text())); - - t = p.expect(nl_type, hash_type, "new line or comment"); - if (t.type() == hash_type) { - (void)p.rest_of_line(); - t = p.expect(nl_type, "new line"); - } - } else if (t.type() == nl_type) { - } else - std::abort(); - } catch (const parse_error& pe) { - p.add_error(pe); - p.reset(nl_type); - } - } - - ATF_PARSER_CALLBACK(p, got_eof()); -} - -vars_map -impl::merge_configs(const vars_map& lower, - const vars_map& upper) -{ - vars_map merged = lower; - merge_maps(merged, upper); - return merged; -} - -vars_map -impl::read_config_files(const std::string& test_suite_name) -{ - vars_map config; - - const std::vector< tools::fs::path > dirs = get_config_dirs(); - for (std::vector< tools::fs::path >::const_iterator iter = dirs.begin(); - iter != dirs.end(); iter++) { - merge_config_file((*iter) / "common.conf", config); - merge_config_file((*iter) / (test_suite_name + ".conf"), config); - } - - return config; -} diff --git a/tools/config_file.hpp b/tools/config_file.hpp deleted file mode 100644 index 0c68bcb051ac..000000000000 --- a/tools/config_file.hpp +++ /dev/null @@ -1,66 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_CONFIG_FILE_HPP) -#define TOOLS_CONFIG_FILE_HPP - -#include -#include -#include - -namespace tools { -namespace config_file { - -namespace detail { - -class atf_config_reader { - std::istream& m_is; - -protected: - virtual void got_var(const std::string&, const std::string &); - virtual void got_eof(void); - -public: - atf_config_reader(std::istream&); - virtual ~atf_config_reader(void); - - void read(void); -}; - -} // namespace detail - -std::map< std::string, std::string > merge_configs( - const std::map< std::string, std::string >&, - const std::map< std::string, std::string >&); -std::map< std::string, std::string > read_config_files(const std::string&); - -} // namespace config_file -} // namespace tools - -#endif // !defined(TOOLS_CONFIG_FILE_HPP) diff --git a/tools/config_file_test.cpp b/tools/config_file_test.cpp deleted file mode 100644 index b8adc7aa3469..000000000000 --- a/tools/config_file_test.cpp +++ /dev/null @@ -1,395 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include "config.hpp" -#include "config_file.hpp" -#include "env.hpp" -#include "test_helpers.hpp" - -namespace impl = tools::config_file; -namespace detail = tools::config_file::detail; - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -} // anonymous namespace - -namespace atf { -namespace config { - -void __reinit(void); - -} // namespace config -} // namespace atf - -// ------------------------------------------------------------------------- -// Tests for the "config" parser. -// ------------------------------------------------------------------------- - -class config_reader : protected detail::atf_config_reader { - void - got_var(const std::string& name, const std::string& val) - { - m_calls.push_back("got_var(" + name + ", " + val + ")"); - } - - void - got_eof(void) - { - m_calls.push_back("got_eof()"); - } - -public: - config_reader(std::istream& is) : - detail::atf_config_reader(is) - { - } - - void - read(void) - { - atf_config_reader::read(); - } - - std::vector< std::string > m_calls; -}; - -ATF_TEST_CASE_WITHOUT_HEAD(config_1); -ATF_TEST_CASE_BODY(config_1) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - ; - - const char* exp_calls[] = { - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(config_2); -ATF_TEST_CASE_BODY(config_2) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - "# This is a comment on a line of its own.\n" - "# And this is another one.\n" - "\n" - " # Another after some whitespace.\n" - "\n" - "# The last one after an empty line.\n" - ; - - const char* exp_calls[] = { - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(config_3); -ATF_TEST_CASE_BODY(config_3) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - "var1=value1\n" - "var2 = value2\n" - "var3 = value3\n" - "var4 = value4\n" - "\n" - "var5=value5\n" - " var6=value6\n" - "\n" - "var7 = \"This is a long value.\"\n" - "var8 = \"Single-word\"\n" - "var9 = \" Single-word \"\n" - "var10 = Single-word\n" - ; - - const char* exp_calls[] = { - "got_var(var1, value1)", - "got_var(var2, value2)", - "got_var(var3, value3)", - "got_var(var4, value4)", - "got_var(var5, value5)", - "got_var(var6, value6)", - "got_var(var7, This is a long value.)", - "got_var(var8, Single-word)", - "got_var(var9, Single-word )", - "got_var(var10, Single-word)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(config_4); -ATF_TEST_CASE_BODY(config_4) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - "foo = bar # A comment.\n" - ; - - const char* exp_calls[] = { - "got_var(foo, bar)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(config_50); -ATF_TEST_CASE_BODY(config_50) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - "foo\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected equal sign", - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(config_51); -ATF_TEST_CASE_BODY(config_51) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - "foo bar\n" - "baz\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `bar'; expected equal sign", - "4: Unexpected token `<>'; expected equal sign", - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(config_52); -ATF_TEST_CASE_BODY(config_52) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - "foo =\n" - "bar = # A comment.\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected word or quoted string", - "4: Unexpected token `#'; expected word or quoted string", - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(config_53); -ATF_TEST_CASE_BODY(config_53) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - "foo = \"Correct value\" # With comment.\n" - "\n" - "bar = # A comment.\n" - "\n" - "baz = \"Last variable\"\n" - "\n" - "# End of file.\n" - ; - - const char* exp_calls[] = { - "got_var(foo, Correct value)", - NULL - }; - - const char* exp_errors[] = { - "5: Unexpected token `#'; expected word or quoted string", - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(config_54); -ATF_TEST_CASE_BODY(config_54) -{ - const char* input = - "Content-Type: application/X-atf-config; version=\"1\"\n" - "\n" - "foo = \"\n" - "bar = \"text\n" - "baz = \"te\\\"xt\n" - "last = \"\\\"\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Missing double quotes before end of line", - "4: Missing double quotes before end of line", - "5: Missing double quotes before end of line", - "6: Missing double quotes before end of line", - NULL - }; - - do_parser_test< config_reader >(input, exp_calls, exp_errors); -} - -// ------------------------------------------------------------------------- -// Tests for the free functions. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE(merge_configs_both_empty); -ATF_TEST_CASE_HEAD(merge_configs_both_empty) {} -ATF_TEST_CASE_BODY(merge_configs_both_empty) { - vars_map lower, upper; - - ATF_REQUIRE(impl::merge_configs(lower, upper).empty()); -} - -ATF_TEST_CASE(merge_configs_lower_empty); -ATF_TEST_CASE_HEAD(merge_configs_lower_empty) {} -ATF_TEST_CASE_BODY(merge_configs_lower_empty) { - vars_map lower, upper; - upper["var"] = "value"; - - vars_map merged = impl::merge_configs(lower, upper); - ATF_REQUIRE_EQ("value", merged["var"]); -} - -ATF_TEST_CASE(merge_configs_upper_empty); -ATF_TEST_CASE_HEAD(merge_configs_upper_empty) {} -ATF_TEST_CASE_BODY(merge_configs_upper_empty) { - vars_map lower, upper; - lower["var"] = "value"; - - vars_map merged = impl::merge_configs(lower, upper); - ATF_REQUIRE_EQ("value", merged["var"]); -} - -ATF_TEST_CASE(merge_configs_mixed); -ATF_TEST_CASE_HEAD(merge_configs_mixed) {} -ATF_TEST_CASE_BODY(merge_configs_mixed) { - vars_map lower, upper; - lower["var1"] = "value1"; - lower["var2"] = "value2-l"; - upper["var2"] = "value2-u"; - upper["var3"] = "value3"; - - vars_map merged = impl::merge_configs(lower, upper); - ATF_REQUIRE_EQ("value1", merged["var1"]); - ATF_REQUIRE_EQ("value2-u", merged["var2"]); - ATF_REQUIRE_EQ("value3", merged["var3"]); -} - -ATF_TEST_CASE(read_config_files_none); -ATF_TEST_CASE_HEAD(read_config_files_none) {} -ATF_TEST_CASE_BODY(read_config_files_none) { - tools::env::set("ATF_CONFDIR", "."); - atf::config::__reinit(); - ATF_REQUIRE(vars_map() == impl::read_config_files("test-suite")); -} - -// ------------------------------------------------------------------------- -// Main. -// ------------------------------------------------------------------------- - -ATF_INIT_TEST_CASES(tcs) -{ - ATF_ADD_TEST_CASE(tcs, config_1); - ATF_ADD_TEST_CASE(tcs, config_2); - ATF_ADD_TEST_CASE(tcs, config_3); - ATF_ADD_TEST_CASE(tcs, config_4); - ATF_ADD_TEST_CASE(tcs, config_50); - ATF_ADD_TEST_CASE(tcs, config_51); - ATF_ADD_TEST_CASE(tcs, config_52); - ATF_ADD_TEST_CASE(tcs, config_53); - ATF_ADD_TEST_CASE(tcs, config_54); - - ATF_ADD_TEST_CASE(tcs, merge_configs_both_empty); - ATF_ADD_TEST_CASE(tcs, merge_configs_lower_empty); - ATF_ADD_TEST_CASE(tcs, merge_configs_upper_empty); - ATF_ADD_TEST_CASE(tcs, merge_configs_mixed); - - ATF_ADD_TEST_CASE(tcs, read_config_files_none); -} diff --git a/tools/config_test.cpp b/tools/config_test.cpp deleted file mode 100644 index d7d67199b5d6..000000000000 --- a/tools/config_test.cpp +++ /dev/null @@ -1,221 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include - -#include - -#include "config.hpp" -#include "env.hpp" -#include "exceptions.hpp" - -static const char *test_value = "env-value"; - -static struct varnames { - const char *lc; - const char *uc; - bool can_be_empty; -} all_vars[] = { - { "atf_arch", "ATF_ARCH", false }, - { "atf_build_cc", "ATF_BUILD_CC", false }, - { "atf_build_cflags", "ATF_BUILD_CFLAGS", true }, - { "atf_build_cpp", "ATF_BUILD_CPP", false }, - { "atf_build_cppflags", "ATF_BUILD_CPPFLAGS", true }, - { "atf_build_cxx", "ATF_BUILD_CXX", false }, - { "atf_build_cxxflags", "ATF_BUILD_CXXFLAGS", true }, - { "atf_confdir", "ATF_CONFDIR", false }, - { "atf_includedir", "ATF_INCLUDEDIR", false }, - { "atf_libdir", "ATF_LIBDIR", false }, - { "atf_libexecdir", "ATF_LIBEXECDIR", false }, - { "atf_machine", "ATF_MACHINE", false }, - { "atf_pkgdatadir", "ATF_PKGDATADIR", false }, - { "atf_shell", "ATF_SHELL", false }, - { "atf_workdir", "ATF_WORKDIR", false }, - { NULL, NULL, false } -}; - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -namespace tools { - namespace config { - void __reinit(void); - } -} - -static -void -set_env_var(const char* name, const char* val) -{ - try { - tools::env::set(name, val); - } catch (const tools::system_error&) { - ATF_FAIL(std::string("set_env_var(") + name + ", " + val + - ") failed"); - } -} - -static -void -unset_env_var(const char* name) -{ - try { - tools::env::unset(name); - } catch (const tools::system_error&) { - ATF_FAIL(std::string("unset_env_var(") + name + ") failed"); - } -} - -static -size_t -all_vars_count(void) -{ - size_t count = 0; - for (const struct varnames* v = all_vars; v->lc != NULL; v++) - count++; - return count; -} - -static -void -unset_all(void) -{ - for (const struct varnames* v = all_vars; v->lc != NULL; v++) - unset_env_var(v->uc); -} - -static -void -compare_one(const char* var, const char* expvalue) -{ - std::cout << "Checking that " << var << " is set to " << expvalue << "\n"; - - for (const struct varnames* v = all_vars; v->lc != NULL; v++) { - if (std::strcmp(v->lc, var) == 0) - ATF_REQUIRE_EQ(tools::config::get(v->lc), test_value); - else - ATF_REQUIRE(tools::config::get(v->lc) != test_value); - } -} - -// ------------------------------------------------------------------------ -// Test cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(get); -ATF_TEST_CASE_HEAD(get) -{ - set_md_var("descr", "Tests the config::get function"); -} -ATF_TEST_CASE_BODY(get) -{ - // Unset all known environment variables and make sure the built-in - // values do not match the bogus value we will use for testing. - unset_all(); - tools::config::__reinit(); - for (const struct varnames* v = all_vars; v->lc != NULL; v++) - ATF_REQUIRE(tools::config::get(v->lc) != test_value); - - // Test the behavior of empty values. - for (const struct varnames* v = all_vars; v->lc != NULL; v++) { - unset_all(); - if (!tools::config::get(v->lc).empty()) { - set_env_var(v->uc, ""); - tools::config::__reinit(); - if (v->can_be_empty) - ATF_REQUIRE(tools::config::get(v->lc).empty()); - else - ATF_REQUIRE(!tools::config::get(v->lc).empty()); - } - } - - // Check if the ATF_ARCH variable is recognized. - for (const struct varnames* v = all_vars; v->lc != NULL; v++) { - unset_all(); - set_env_var(v->uc, test_value); - tools::config::__reinit(); - compare_one(v->lc, test_value); - } -} - -ATF_TEST_CASE(get_all); -ATF_TEST_CASE_HEAD(get_all) -{ - set_md_var("descr", "Tests the config::get_all function"); -} -ATF_TEST_CASE_BODY(get_all) -{ - tools::config::__reinit(); - - // Check that the valid variables, and only those, are returned. - std::map< std::string, std::string > vars = tools::config::get_all(); - ATF_REQUIRE_EQ(vars.size(), all_vars_count()); - for (const struct varnames* v = all_vars; v->lc != NULL; v++) - ATF_REQUIRE(vars.find(v->lc) != vars.end()); -} - -ATF_TEST_CASE(has); -ATF_TEST_CASE_HEAD(has) -{ - set_md_var("descr", "Tests the config::has function"); -} -ATF_TEST_CASE_BODY(has) -{ - tools::config::__reinit(); - - // Check for all the variables that must exist. - for (const struct varnames* v = all_vars; v->lc != NULL; v++) - ATF_REQUIRE(tools::config::has(v->lc)); - - // Same as above, but using uppercase (which is incorrect). - for (const struct varnames* v = all_vars; v->lc != NULL; v++) - ATF_REQUIRE(!tools::config::has(v->uc)); - - // Check for some other variables that cannot exist. - ATF_REQUIRE(!tools::config::has("foo")); - ATF_REQUIRE(!tools::config::has("BAR")); - ATF_REQUIRE(!tools::config::has("atf_foo")); - ATF_REQUIRE(!tools::config::has("ATF_BAR")); - ATF_REQUIRE(!tools::config::has("atf_shel")); - ATF_REQUIRE(!tools::config::has("atf_shells")); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the test cases for the free functions. - ATF_ADD_TEST_CASE(tcs, has); - ATF_ADD_TEST_CASE(tcs, get); - ATF_ADD_TEST_CASE(tcs, get_all); -} diff --git a/tools/defs.hpp.in b/tools/defs.hpp.in deleted file mode 100644 index 95427951998d..000000000000 --- a/tools/defs.hpp.in +++ /dev/null @@ -1,37 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2008 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_DEFS_HPP) -#define TOOLS_DEFS_HPP - -#define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) @ATTRIBUTE_FORMAT_PRINTF@ -#define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@ -#define ATF_DEFS_ATTRIBUTE_UNUSED @ATTRIBUTE_UNUSED@ - -#endif /* !defined(TOOLS_DEFS_HPP) */ diff --git a/tools/env.cpp b/tools/env.cpp deleted file mode 100644 index 1dbdb557bbac..000000000000 --- a/tools/env.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(HAVE_CONFIG_H) -#include "bconfig.h" -#endif - -extern "C" { -#include -#include -#include -} - -#include - -#include "env.hpp" -#include "exceptions.hpp" - -namespace impl = tools::env; -#define IMPL_NAME "tools::env" - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -std::string -impl::get(const std::string& name) -{ - const char* val = getenv(name.c_str()); - assert(val != NULL); - return val; -} - -bool -impl::has(const std::string& name) -{ - return getenv(name.c_str()) != NULL; -} - -void -impl::set(const std::string& name, const std::string& val) -{ -#if defined(HAVE_SETENV) - if (setenv(name.c_str(), val.c_str(), 1) == -1) - throw tools::system_error(IMPL_NAME "::set", - "Cannot set environment variable '" + name + - "' to '" + val + "'", - errno); -#elif defined(HAVE_PUTENV) - const std::string buf = name + "=" + val; - if (putenv(strdup(buf.c_str())) == -1) - throw tools::system_error(IMPL_NAME "::set", - "Cannot set environment variable '" + name + - "' to '" + val + "'", - errno); -#else -# error "Don't know how to set an environment variable." -#endif -} - -void -impl::unset(const std::string& name) -{ -#if defined(HAVE_UNSETENV) - unsetenv(name.c_str()); -#elif defined(HAVE_PUTENV) - const std::string buf = name + "="; - - if (putenv(strdup(buf.c_str())) == -1) - throw tools::system_error(IMPL_NAME "::unset", - "Cannot unset environment variable '" + - name + "'", errno); -#else -# error "Don't know how to unset an environment variable." -#endif -} diff --git a/tools/env.hpp b/tools/env.hpp deleted file mode 100644 index f87a58f92f8d..000000000000 --- a/tools/env.hpp +++ /dev/null @@ -1,84 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_ENV_HPP) -#define TOOLS_ENV_HPP - -#include - -namespace tools { -namespace env { - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -//! -//! \brief Returns the value of an environment variable. -//! -//! Returns the value of the specified environment variable. The variable -//! must be defined. -//! -std::string get(const std::string&); - -//! -//! \brief Checks if the environment has a variable. -//! -//! Checks if the environment has a given variable. -//! -bool has(const std::string&); - -//! -//! \brief Sets an environment variable to a given value. -//! -//! Sets the specified environment variable to the given value. Note that -//! variables set to the empty string are different to undefined ones. -//! -//! Be aware that this alters the program's global status, which in general -//! is a bad thing to do due to the side-effects it may have. There are -//! some legitimate usages for this function, though. -//! -void set(const std::string&, const std::string&); - -//! -//! \brief Unsets an environment variable. -//! -//! Unsets the specified environment variable Note that undefined -//! variables are different to those defined but set to an empty value. -//! -//! Be aware that this alters the program's global status, which in general -//! is a bad thing to do due to the side-effects it may have. There are -//! some legitimate usages for this function, though. -//! -void unset(const std::string&); - -} // namespace env -} // namespace tools - -#endif // !defined(TOOLS_ENV_HPP) diff --git a/tools/env_test.cpp b/tools/env_test.cpp deleted file mode 100644 index 441a16ff8952..000000000000 --- a/tools/env_test.cpp +++ /dev/null @@ -1,91 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include "env.hpp" - -// ------------------------------------------------------------------------ -// Test cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(has_get); -ATF_TEST_CASE_HEAD(has_get) -{ - set_md_var("descr", "Tests the has and get functions"); -} -ATF_TEST_CASE_BODY(has_get) -{ - ATF_REQUIRE(tools::env::has("PATH")); - ATF_REQUIRE(!tools::env::get("PATH").empty()); - - ATF_REQUIRE(!tools::env::has("_UNDEFINED_VARIABLE_")); -} - -ATF_TEST_CASE(set); -ATF_TEST_CASE_HEAD(set) -{ - set_md_var("descr", "Tests the set function"); -} -ATF_TEST_CASE_BODY(set) -{ - ATF_REQUIRE(tools::env::has("PATH")); - const std::string& oldval = tools::env::get("PATH"); - tools::env::set("PATH", "foo-bar"); - ATF_REQUIRE(tools::env::get("PATH") != oldval); - ATF_REQUIRE_EQ(tools::env::get("PATH"), "foo-bar"); - - ATF_REQUIRE(!tools::env::has("_UNDEFINED_VARIABLE_")); - tools::env::set("_UNDEFINED_VARIABLE_", "foo2-bar2"); - ATF_REQUIRE_EQ(tools::env::get("_UNDEFINED_VARIABLE_"), "foo2-bar2"); -} - -ATF_TEST_CASE(unset); -ATF_TEST_CASE_HEAD(unset) -{ - set_md_var("descr", "Tests the unset function"); -} -ATF_TEST_CASE_BODY(unset) -{ - ATF_REQUIRE(tools::env::has("PATH")); - tools::env::unset("PATH"); - ATF_REQUIRE(!tools::env::has("PATH")); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the test cases for the free functions. - ATF_ADD_TEST_CASE(tcs, has_get); - ATF_ADD_TEST_CASE(tcs, set); - ATF_ADD_TEST_CASE(tcs, unset); -} diff --git a/tools/exceptions.cpp b/tools/exceptions.cpp deleted file mode 100644 index 8587121cefa2..000000000000 --- a/tools/exceptions.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include "exceptions.hpp" - -// ------------------------------------------------------------------------ -// The "system_error" type. -// ------------------------------------------------------------------------ - -tools::system_error::system_error(const std::string& who, - const std::string& message, - int sys_err) : - std::runtime_error(who + ": " + message), - m_sys_err(sys_err) -{ -} - -tools::system_error::~system_error(void) - throw() -{ -} - -int -tools::system_error::code(void) - const - throw() -{ - return m_sys_err; -} - -const char* -tools::system_error::what(void) - const - throw() -{ - try { - if (m_message.length() == 0) { - m_message = std::string(std::runtime_error::what()) + ": "; - m_message += ::strerror(m_sys_err); - } - - return m_message.c_str(); - } catch (...) { - return "Unable to format system_error message"; - } -} diff --git a/tools/exceptions.hpp b/tools/exceptions.hpp deleted file mode 100644 index 4346b7b54fb9..000000000000 --- a/tools/exceptions.hpp +++ /dev/null @@ -1,93 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_EXCEPTIONS_HPP) -#define TOOLS_EXCEPTIONS_HPP - -#include -#include - -namespace tools { - -template< class T > -class not_found_error : - public std::runtime_error -{ - T m_value; - -public: - not_found_error(const std::string& message, const T& value) throw(); - - virtual ~not_found_error(void) throw(); - - const T& get_value(void) const throw(); -}; - -template< class T > -inline -not_found_error< T >::not_found_error(const std::string& message, - const T& value) - throw() : - std::runtime_error(message), - m_value(value) -{ -} - -template< class T > -inline -not_found_error< T >::~not_found_error(void) - throw() -{ -} - -template< class T > -inline -const T& -not_found_error< T >::get_value(void) - const - throw() -{ - return m_value; -} - -class system_error : public std::runtime_error { - int m_sys_err; - mutable std::string m_message; - -public: - system_error(const std::string&, const std::string&, int); - ~system_error(void) throw(); - - int code(void) const throw(); - const char* what(void) const throw(); -}; - -} // namespace tools - -#endif // !defined(TOOLS_EXCEPTIONS_HPP) diff --git a/tools/expand.cpp b/tools/expand.cpp deleted file mode 100644 index 3ae27d05e55f..000000000000 --- a/tools/expand.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include "expand.hpp" -#include "text.hpp" - -namespace impl = tools::expand; -#define IMPL_NAME "tools::expand" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -namespace { - -std::string -glob_to_regex(const std::string& glob) -{ - std::string regex; - regex.reserve(glob.length() * 2); - - regex += '^'; - for (std::string::const_iterator iter = glob.begin(); iter != glob.end(); - iter++) { - switch (*iter) { - case '*': regex += ".*"; break; - case '?': regex += "."; break; - default: regex += *iter; - } - } - regex += '$'; - - return regex; -} - -} // anonymous namespace - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -bool -impl::is_glob(const std::string& glob) -{ - // NOTE: Keep this in sync with glob_to_regex! - return glob.find_first_of("*?") != std::string::npos; -} - -bool -impl::matches_glob(const std::string& glob, const std::string& candidate) -{ - return tools::text::match(candidate, glob_to_regex(glob)); -} diff --git a/tools/expand.hpp b/tools/expand.hpp deleted file mode 100644 index b8135445af04..000000000000 --- a/tools/expand.hpp +++ /dev/null @@ -1,82 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_EXPAND_HPP) -#define TOOLS_EXPAND_HPP - -#include -#include - -namespace tools { -namespace expand { - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -//! -//! \brief Checks if the given string is a glob pattern. -//! -//! Returns true if the given string is a glob pattern; i.e. if it contains -//! any character that will be expanded by expand_glob. -//! -bool is_glob(const std::string&); - -//! -//! \brief Checks if a given string matches a glob pattern. -//! -//! Given a glob pattern and a string, checks whether the former matches -//! the latter. Returns a boolean indicating this condition. -//! -bool matches_glob(const std::string&, const std::string&); - -//! -//! \brief Expands a glob pattern among multiple candidates. -//! -//! Given a glob pattern and a set of candidate strings, checks which of -//! those strings match the glob pattern and returns them. -//! -template< class T > -std::vector< std::string > expand_glob(const std::string& glob, - const T& candidates) -{ - std::vector< std::string > exps; - - for (typename T::const_iterator iter = candidates.begin(); - iter != candidates.end(); iter++) - if (matches_glob(glob, *iter)) - exps.push_back(*iter); - - return exps; -} - -} // namespace expand -} // namespace tools - -#endif // !defined(TOOLS_EXPAND_HPP) diff --git a/tools/expand_test.cpp b/tools/expand_test.cpp deleted file mode 100644 index fb59de8db2ae..000000000000 --- a/tools/expand_test.cpp +++ /dev/null @@ -1,272 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include - -#include "expand.hpp" - -// XXX Many of the tests here are duplicated in atf-c/t_expand. Should -// find a way to easily share them, or maybe remove the ones here. - -// ------------------------------------------------------------------------ -// Test cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(is_glob); -ATF_TEST_CASE_HEAD(is_glob) -{ - set_md_var("descr", "Tests the is_glob function."); -} -ATF_TEST_CASE_BODY(is_glob) -{ - using tools::expand::is_glob; - - ATF_REQUIRE(!is_glob("")); - ATF_REQUIRE(!is_glob("a")); - ATF_REQUIRE(!is_glob("foo")); - - ATF_REQUIRE( is_glob("*")); - ATF_REQUIRE( is_glob("a*")); - ATF_REQUIRE( is_glob("*a")); - ATF_REQUIRE( is_glob("a*b")); - - ATF_REQUIRE( is_glob("?")); - ATF_REQUIRE( is_glob("a?")); - ATF_REQUIRE( is_glob("?a")); - ATF_REQUIRE( is_glob("a?b")); -} - -ATF_TEST_CASE(matches_glob_plain); -ATF_TEST_CASE_HEAD(matches_glob_plain) -{ - set_md_var("descr", "Tests the matches_glob function by using plain " - "text strings as patterns only."); -} -ATF_TEST_CASE_BODY(matches_glob_plain) -{ - using tools::expand::matches_glob; - - ATF_REQUIRE( matches_glob("", "")); - ATF_REQUIRE(!matches_glob("a", "")); - ATF_REQUIRE(!matches_glob("", "a")); - - ATF_REQUIRE( matches_glob("ab", "ab")); - ATF_REQUIRE(!matches_glob("abc", "ab")); - ATF_REQUIRE(!matches_glob("ab", "abc")); -} - -ATF_TEST_CASE(matches_glob_star); -ATF_TEST_CASE_HEAD(matches_glob_star) -{ - set_md_var("descr", "Tests the matches_glob function by using the '*' " - "meta-character as part of the pattern."); -} -ATF_TEST_CASE_BODY(matches_glob_star) -{ - using tools::expand::matches_glob; - - ATF_REQUIRE( matches_glob("*", "")); - ATF_REQUIRE( matches_glob("*", "a")); - ATF_REQUIRE( matches_glob("*", "ab")); - - ATF_REQUIRE(!matches_glob("a*", "")); - ATF_REQUIRE( matches_glob("a*", "a")); - ATF_REQUIRE( matches_glob("a*", "aa")); - ATF_REQUIRE( matches_glob("a*", "ab")); - ATF_REQUIRE( matches_glob("a*", "abc")); - ATF_REQUIRE(!matches_glob("a*", "ba")); - - ATF_REQUIRE( matches_glob("*a", "a")); - ATF_REQUIRE( matches_glob("*a", "ba")); - ATF_REQUIRE(!matches_glob("*a", "bc")); - ATF_REQUIRE(!matches_glob("*a", "bac")); - - ATF_REQUIRE( matches_glob("*ab", "ab")); - ATF_REQUIRE( matches_glob("*ab", "aab")); - ATF_REQUIRE( matches_glob("*ab", "aaab")); - ATF_REQUIRE( matches_glob("*ab", "bab")); - ATF_REQUIRE(!matches_glob("*ab", "bcb")); - ATF_REQUIRE(!matches_glob("*ab", "bacb")); - - ATF_REQUIRE( matches_glob("a*b", "ab")); - ATF_REQUIRE( matches_glob("a*b", "acb")); - ATF_REQUIRE( matches_glob("a*b", "acdeb")); - ATF_REQUIRE(!matches_glob("a*b", "acdebz")); - ATF_REQUIRE(!matches_glob("a*b", "zacdeb")); -} - -ATF_TEST_CASE(matches_glob_question); -ATF_TEST_CASE_HEAD(matches_glob_question) -{ - set_md_var("descr", "Tests the matches_glob function by using the '?' " - "meta-character as part of the pattern."); -} -ATF_TEST_CASE_BODY(matches_glob_question) -{ - using tools::expand::matches_glob; - - ATF_REQUIRE(!matches_glob("?", "")); - ATF_REQUIRE( matches_glob("?", "a")); - ATF_REQUIRE(!matches_glob("?", "ab")); - - ATF_REQUIRE( matches_glob("?", "b")); - ATF_REQUIRE( matches_glob("?", "c")); - - ATF_REQUIRE( matches_glob("a?", "ab")); - ATF_REQUIRE( matches_glob("a?", "ac")); - ATF_REQUIRE(!matches_glob("a?", "ca")); - - ATF_REQUIRE( matches_glob("???", "abc")); - ATF_REQUIRE( matches_glob("???", "def")); - ATF_REQUIRE(!matches_glob("???", "a")); - ATF_REQUIRE(!matches_glob("???", "ab")); - ATF_REQUIRE(!matches_glob("???", "abcd")); -} - -ATF_TEST_CASE(expand_glob_base); -ATF_TEST_CASE_HEAD(expand_glob_base) -{ - set_md_var("descr", "Tests the expand_glob function with random " - "patterns."); -} -ATF_TEST_CASE_BODY(expand_glob_base) -{ - using tools::expand::expand_glob; - - std::vector< std::string > candidates; - candidates.push_back("foo"); - candidates.push_back("bar"); - candidates.push_back("baz"); - candidates.push_back("foobar"); - candidates.push_back("foobarbaz"); - candidates.push_back("foobarbazfoo"); - - std::vector< std::string > exps; - - exps = expand_glob("foo", candidates); - ATF_REQUIRE_EQ(exps.size(), 1); - ATF_REQUIRE(exps[0] == "foo"); - - exps = expand_glob("bar", candidates); - ATF_REQUIRE_EQ(exps.size(), 1); - ATF_REQUIRE(exps[0] == "bar"); - - exps = expand_glob("foo*", candidates); - ATF_REQUIRE_EQ(exps.size(), 4); - ATF_REQUIRE(exps[0] == "foo"); - ATF_REQUIRE(exps[1] == "foobar"); - ATF_REQUIRE(exps[2] == "foobarbaz"); - ATF_REQUIRE(exps[3] == "foobarbazfoo"); - - exps = expand_glob("*foo", candidates); - ATF_REQUIRE_EQ(exps.size(), 2); - ATF_REQUIRE(exps[0] == "foo"); - ATF_REQUIRE(exps[1] == "foobarbazfoo"); - - exps = expand_glob("*foo*", candidates); - ATF_REQUIRE_EQ(exps.size(), 4); - ATF_REQUIRE(exps[0] == "foo"); - ATF_REQUIRE(exps[1] == "foobar"); - ATF_REQUIRE(exps[2] == "foobarbaz"); - ATF_REQUIRE(exps[3] == "foobarbazfoo"); - - exps = expand_glob("ba", candidates); - ATF_REQUIRE_EQ(exps.size(), 0); - - exps = expand_glob("ba*", candidates); - ATF_REQUIRE_EQ(exps.size(), 2); - ATF_REQUIRE(exps[0] == "bar"); - ATF_REQUIRE(exps[1] == "baz"); - - exps = expand_glob("*ba", candidates); - ATF_REQUIRE_EQ(exps.size(), 0); - - exps = expand_glob("*ba*", candidates); - ATF_REQUIRE_EQ(exps.size(), 5); - ATF_REQUIRE(exps[0] == "bar"); - ATF_REQUIRE(exps[1] == "baz"); - ATF_REQUIRE(exps[2] == "foobar"); - ATF_REQUIRE(exps[3] == "foobarbaz"); - ATF_REQUIRE(exps[4] == "foobarbazfoo"); -} - -ATF_TEST_CASE(expand_glob_tps); -ATF_TEST_CASE_HEAD(expand_glob_tps) -{ - set_md_var("descr", "Tests the expand_glob function with patterns that " - "match typical test program names. This is just a subcase " - "of expand_base, but it is nice to make sure that it really " - "works."); -} -ATF_TEST_CASE_BODY(expand_glob_tps) -{ - using tools::expand::expand_glob; - - std::vector< std::string > candidates; - candidates.push_back("Atffile"); - candidates.push_back("h_foo"); - candidates.push_back("t_foo"); - candidates.push_back("t_bar"); - candidates.push_back("t_baz"); - candidates.push_back("foo_helper"); - candidates.push_back("foo_test"); - candidates.push_back("bar_test"); - candidates.push_back("baz_test"); - - std::vector< std::string > exps; - - exps = expand_glob("t_*", candidates); - ATF_REQUIRE_EQ(exps.size(), 3); - ATF_REQUIRE(exps[0] == "t_foo"); - ATF_REQUIRE(exps[1] == "t_bar"); - ATF_REQUIRE(exps[2] == "t_baz"); - - exps = expand_glob("*_test", candidates); - ATF_REQUIRE_EQ(exps.size(), 3); - ATF_REQUIRE(exps[0] == "foo_test"); - ATF_REQUIRE(exps[1] == "bar_test"); - ATF_REQUIRE(exps[2] == "baz_test"); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the tests for the free functions. - ATF_ADD_TEST_CASE(tcs, is_glob); - ATF_ADD_TEST_CASE(tcs, matches_glob_plain); - ATF_ADD_TEST_CASE(tcs, matches_glob_star); - ATF_ADD_TEST_CASE(tcs, matches_glob_question); - ATF_ADD_TEST_CASE(tcs, expand_glob_base); - ATF_ADD_TEST_CASE(tcs, expand_glob_tps); -} diff --git a/tools/expect_helpers.c b/tools/expect_helpers.c deleted file mode 100644 index b38ccf574bc8..000000000000 --- a/tools/expect_helpers.c +++ /dev/null @@ -1,193 +0,0 @@ -/* - * Automated Testing Framework (atf) - * - * Copyright (c) 2010 The NetBSD Foundation, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include - -#include - -ATF_TC_WITHOUT_HEAD(pass_and_pass); -ATF_TC_BODY(pass_and_pass, tc) -{ - atf_tc_expect_pass(); -} - -ATF_TC_WITHOUT_HEAD(pass_but_fail_requirement); -ATF_TC_BODY(pass_but_fail_requirement, tc) -{ - atf_tc_expect_pass(); - atf_tc_fail("Some reason"); -} - -ATF_TC_WITHOUT_HEAD(pass_but_fail_check); -ATF_TC_BODY(pass_but_fail_check, tc) -{ - atf_tc_expect_pass(); - atf_tc_fail_nonfatal("Some reason"); -} - -ATF_TC_WITHOUT_HEAD(fail_and_fail_requirement); -ATF_TC_BODY(fail_and_fail_requirement, tc) -{ - atf_tc_expect_fail("Fail %s", "reason"); - atf_tc_fail("The failure"); - atf_tc_expect_pass(); -} - -ATF_TC_WITHOUT_HEAD(fail_and_fail_check); -ATF_TC_BODY(fail_and_fail_check, tc) -{ - atf_tc_expect_fail("Fail first"); - atf_tc_fail_nonfatal("abc"); - atf_tc_expect_pass(); - - atf_tc_expect_fail("And fail again"); - atf_tc_fail_nonfatal("def"); - atf_tc_expect_pass(); -} - -ATF_TC_WITHOUT_HEAD(fail_but_pass); -ATF_TC_BODY(fail_but_pass, tc) -{ - atf_tc_expect_fail("Fail first"); - atf_tc_fail_nonfatal("abc"); - atf_tc_expect_pass(); - - atf_tc_expect_fail("Will not fail"); - atf_tc_expect_pass(); - - atf_tc_expect_fail("And fail again"); - atf_tc_fail_nonfatal("def"); - atf_tc_expect_pass(); -} - -ATF_TC_WITHOUT_HEAD(exit_any_and_exit); -ATF_TC_BODY(exit_any_and_exit, tc) -{ - atf_tc_expect_exit(-1, "Call will exit"); - exit(EXIT_SUCCESS); -} - -ATF_TC_WITHOUT_HEAD(exit_code_and_exit); -ATF_TC_BODY(exit_code_and_exit, tc) -{ - atf_tc_expect_exit(123, "Call will exit"); - exit(123); -} - -ATF_TC_WITHOUT_HEAD(exit_but_pass); -ATF_TC_BODY(exit_but_pass, tc) -{ - atf_tc_expect_exit(-1, "Call won't exit"); -} - -ATF_TC_WITHOUT_HEAD(signal_any_and_signal); -ATF_TC_BODY(signal_any_and_signal, tc) -{ - atf_tc_expect_signal(-1, "Call will signal"); - kill(getpid(), SIGKILL); -} - -ATF_TC_WITHOUT_HEAD(signal_no_and_signal); -ATF_TC_BODY(signal_no_and_signal, tc) -{ - atf_tc_expect_signal(SIGHUP, "Call will signal"); - kill(getpid(), SIGHUP); -} - -ATF_TC_WITHOUT_HEAD(signal_but_pass); -ATF_TC_BODY(signal_but_pass, tc) -{ - atf_tc_expect_signal(-1, "Call won't signal"); -} - -ATF_TC_WITHOUT_HEAD(death_and_exit); -ATF_TC_BODY(death_and_exit, tc) -{ - atf_tc_expect_death("Exit case"); - exit(123); -} - -ATF_TC_WITHOUT_HEAD(death_and_signal); -ATF_TC_BODY(death_and_signal, tc) -{ - atf_tc_expect_death("Signal case"); - kill(getpid(), SIGKILL); -} - -ATF_TC_WITHOUT_HEAD(death_but_pass); -ATF_TC_BODY(death_but_pass, tc) -{ - atf_tc_expect_death("Call won't die"); -} - -ATF_TC(timeout_and_hang); -ATF_TC_HEAD(timeout_and_hang, tc) -{ - atf_tc_set_md_var(tc, "timeout", "1"); -} -ATF_TC_BODY(timeout_and_hang, tc) -{ - atf_tc_expect_timeout("Will overrun"); - sleep(5); -} - -ATF_TC(timeout_but_pass); -ATF_TC_HEAD(timeout_but_pass, tc) -{ - atf_tc_set_md_var(tc, "timeout", "1"); -} -ATF_TC_BODY(timeout_but_pass, tc) -{ - atf_tc_expect_timeout("Will just exit"); -} - -ATF_TP_ADD_TCS(tp) -{ - ATF_TP_ADD_TC(tp, pass_and_pass); - ATF_TP_ADD_TC(tp, pass_but_fail_requirement); - ATF_TP_ADD_TC(tp, pass_but_fail_check); - ATF_TP_ADD_TC(tp, fail_and_fail_requirement); - ATF_TP_ADD_TC(tp, fail_and_fail_check); - ATF_TP_ADD_TC(tp, fail_but_pass); - ATF_TP_ADD_TC(tp, exit_any_and_exit); - ATF_TP_ADD_TC(tp, exit_code_and_exit); - ATF_TP_ADD_TC(tp, exit_but_pass); - ATF_TP_ADD_TC(tp, signal_any_and_signal); - ATF_TP_ADD_TC(tp, signal_no_and_signal); - ATF_TP_ADD_TC(tp, signal_but_pass); - ATF_TP_ADD_TC(tp, death_and_exit); - ATF_TP_ADD_TC(tp, death_and_signal); - ATF_TP_ADD_TC(tp, death_but_pass); - ATF_TP_ADD_TC(tp, timeout_and_hang); - ATF_TP_ADD_TC(tp, timeout_but_pass); - - return atf_no_error(); -} diff --git a/tools/fail_helper.cpp b/tools/fail_helper.cpp deleted file mode 100644 index 736b5e8be08e..000000000000 --- a/tools/fail_helper.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -ATF_TEST_CASE(main); -ATF_TEST_CASE_HEAD(main) -{ - set_md_var("descr", "Helper test case that always fails"); -} -ATF_TEST_CASE_BODY(main) -{ - fail("This always fails"); -} - -ATF_INIT_TEST_CASES(tcs) -{ - ATF_ADD_TEST_CASE(tcs, main); -} diff --git a/tools/fs.cpp b/tools/fs.cpp deleted file mode 100644 index fde78150284f..000000000000 --- a/tools/fs.cpp +++ /dev/null @@ -1,744 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(HAVE_CONFIG_H) -#include "bconfig.h" -#endif - -extern "C" { -#include -#include -#include -#include -#include - -#include -#include -#include -} - -#include -#include -#include -#include - -#include "auto_array.hpp" -#include "env.hpp" -#include "exceptions.hpp" -#include "fs.hpp" -#include "process.hpp" -#include "text.hpp" -#include "user.hpp" - -namespace impl = tools::fs; -#define IMPL_NAME "tools::fs" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -static void cleanup_aux(const impl::path&, dev_t, bool); -static void cleanup_aux_dir(const impl::path&, const impl::file_info&, - bool); -static void do_unmount(const impl::path&); -static bool safe_access(const impl::path&, int, int); - -static const int access_f = 1 << 0; -static const int access_r = 1 << 1; -static const int access_w = 1 << 2; -static const int access_x = 1 << 3; - -//! -//! An implementation of access(2) but using the effective user value -//! instead of the real one. Also avoids false positives for root when -//! asking for execute permissions, which appear in SunOS. -//! -static -void -eaccess(const tools::fs::path& p, int mode) -{ - assert(mode & access_f || mode & access_r || - mode & access_w || mode & access_x); - - struct stat st; - if (lstat(p.c_str(), &st) == -1) - throw tools::system_error(IMPL_NAME "::eaccess", - "Cannot get information from file " + - p.str(), errno); - - /* Early return if we are only checking for existence and the file - * exists (stat call returned). */ - if (mode & access_f) - return; - - bool ok = false; - if (tools::user::is_root()) { - if (!ok && !(mode & access_x)) { - /* Allow root to read/write any file. */ - ok = true; - } - - if (!ok && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) { - /* Allow root to execute the file if any of its execution bits - * are set. */ - ok = true; - } - } else { - if (!ok && (tools::user::euid() == st.st_uid)) { - ok = ((mode & access_r) && (st.st_mode & S_IRUSR)) || - ((mode & access_w) && (st.st_mode & S_IWUSR)) || - ((mode & access_x) && (st.st_mode & S_IXUSR)); - } - if (!ok && tools::user::is_member_of_group(st.st_gid)) { - ok = ((mode & access_r) && (st.st_mode & S_IRGRP)) || - ((mode & access_w) && (st.st_mode & S_IWGRP)) || - ((mode & access_x) && (st.st_mode & S_IXGRP)); - } - if (!ok && ((tools::user::euid() != st.st_uid) && - !tools::user::is_member_of_group(st.st_gid))) { - ok = ((mode & access_r) && (st.st_mode & S_IROTH)) || - ((mode & access_w) && (st.st_mode & S_IWOTH)) || - ((mode & access_x) && (st.st_mode & S_IXOTH)); - } - } - - if (!ok) - throw tools::system_error(IMPL_NAME "::eaccess", "Access check failed", - EACCES); -} - -//! -//! \brief A controlled version of access(2). -//! -//! This function reimplements the standard access(2) system call to -//! safely control its exit status and raise an exception in case of -//! failure. -//! -static -bool -safe_access(const impl::path& p, int mode, int experr) -{ - try { - eaccess(p, mode); - return true; - } catch (const tools::system_error& e) { - if (e.code() == experr) - return false; - else - throw e; - } -} - -// The cleanup routines below are tricky: they are executed immediately after -// a test case's death, and after we have forcibly killed any stale processes. -// However, even if the processes are dead, this does not mean that the file -// system we are scanning is stable. In particular, if the test case has -// mounted file systems through fuse/puffs, the fact that the processes died -// does not mean that the file system is truly unmounted. -// -// The code below attempts to cope with this by catching errors and either -// ignoring them or retrying the actions on the same file/directory a few times -// before giving up. -static const int max_retries = 5; -static const int retry_delay_in_seconds = 1; - -// The erase parameter in this routine is to control nested mount points. -// We want to descend into a mount point to unmount anything that is -// mounted under it, but we do not want to delete any files while doing -// this traversal. In other words, we erase files until we cross the -// first mount point, and after that point we only scan and unmount. -static -void -cleanup_aux(const impl::path& p, dev_t parent_device, bool erase) -{ - try { - impl::file_info fi(p); - - if (fi.get_type() == impl::file_info::dir_type) - cleanup_aux_dir(p, fi, fi.get_device() == parent_device); - - if (fi.get_device() != parent_device) - do_unmount(p); - - if (erase) { - if (fi.get_type() == impl::file_info::dir_type) - impl::rmdir(p); - else - impl::remove(p); - } - } catch (const tools::system_error& e) { - if (e.code() != ENOENT && e.code() != ENOTDIR) - throw e; - } -} - -static -void -cleanup_aux_dir(const impl::path& p, const impl::file_info& fi, - bool erase) -{ - if (erase && ((fi.get_mode() & S_IRWXU) != S_IRWXU)) { - int retries = max_retries; -retry_chmod: - if (chmod(p.c_str(), fi.get_mode() | S_IRWXU) == -1) { - if (retries > 0) { - retries--; - ::sleep(retry_delay_in_seconds); - goto retry_chmod; - } else { - throw tools::system_error(IMPL_NAME "::cleanup(" + - p.str() + ")", "chmod(2) failed", - errno); - } - } - } - - std::set< std::string > subdirs; - { - bool ok = false; - int retries = max_retries; - while (!ok) { - assert(retries > 0); - try { - const impl::directory d(p); - subdirs = d.names(); - ok = true; - } catch (const tools::system_error& e) { - retries--; - if (retries == 0) - throw e; - ::sleep(retry_delay_in_seconds); - } - } - assert(ok); - } - - for (std::set< std::string >::const_iterator iter = subdirs.begin(); - iter != subdirs.end(); iter++) { - const std::string& name = *iter; - if (name != "." && name != "..") - cleanup_aux(p / name, fi.get_device(), erase); - } -} - -static -void -do_unmount(const impl::path& in_path) -{ - // At least, FreeBSD's unmount(2) requires the path to be absolute. - // Let's make it absolute in all cases just to be safe that this does - // not affect other systems. - const impl::path& abs_path = in_path.is_absolute() ? - in_path : in_path.to_absolute(); - -#if defined(HAVE_UNMOUNT) - int retries = max_retries; -retry_unmount: - if (unmount(abs_path.c_str(), 0) == -1) { - if (errno == EBUSY && retries > 0) { - retries--; - ::sleep(retry_delay_in_seconds); - goto retry_unmount; - } else { - throw tools::system_error(IMPL_NAME "::cleanup(" + in_path.str() + - ")", "unmount(2) failed", errno); - } - } -#else - // We could use umount(2) instead if it was available... but - // trying to do so under, e.g. Linux, is a nightmare because we - // also have to update /etc/mtab to match what we did. It is - // stools::fser to just leave the system-specific umount(8) tool deal - // with it, at least for now. - - const impl::path prog("umount"); - tools::process::argv_array argv("umount", abs_path.c_str(), NULL); - - tools::process::status s = tools::process::exec(prog, argv, - tools::process::stream_inherit(), tools::process::stream_inherit()); - if (!s.exited() || s.exitstatus() != EXIT_SUCCESS) - throw std::runtime_error("Call to unmount failed"); -#endif -} - -static -std::string -normalize(const std::string& in) -{ - assert(!in.empty()); - - std::string out; - - std::string::size_type pos = 0; - do { - const std::string::size_type next_pos = in.find('/', pos); - - const std::string component = in.substr(pos, next_pos - pos); - if (!component.empty()) { - if (pos == 0) - out += component; - else if (component != ".") - out += "/" + component; - } - - if (next_pos == std::string::npos) - pos = next_pos; - else - pos = next_pos + 1; - } while (pos != std::string::npos); - - return out.empty() ? "/" : out; -} - -// ------------------------------------------------------------------------ -// The "path" class. -// ------------------------------------------------------------------------ - -impl::path::path(const std::string& s) : - m_data(normalize(s)) -{ -} - -impl::path::~path(void) -{ -} - -const char* -impl::path::c_str(void) - const -{ - return m_data.c_str(); -} - -std::string -impl::path::str(void) - const -{ - return m_data; -} - -bool -impl::path::is_absolute(void) - const -{ - return !m_data.empty() && m_data[0] == '/'; -} - -bool -impl::path::is_root(void) - const -{ - return m_data == "/"; -} - -impl::path -impl::path::branch_path(void) - const -{ - const std::string::size_type endpos = m_data.rfind('/'); - if (endpos == std::string::npos) - return path("."); - else if (endpos == 0) - return path("/"); - else - return path(m_data.substr(0, endpos)); -} - -std::string -impl::path::leaf_name(void) - const -{ - std::string::size_type begpos = m_data.rfind('/'); - if (begpos == std::string::npos) - begpos = 0; - else - begpos++; - - return m_data.substr(begpos); -} - -impl::path -impl::path::to_absolute(void) - const -{ - assert(!is_absolute()); - return get_current_dir() / m_data; -} - -bool -impl::path::operator==(const path& p) - const -{ - return m_data == p.m_data; -} - -bool -impl::path::operator!=(const path& p) - const -{ - return m_data != p.m_data; -} - -impl::path -impl::path::operator/(const std::string& p) - const -{ - return path(m_data + "/" + normalize(p)); -} - -impl::path -impl::path::operator/(const path& p) - const -{ - return path(m_data) / p.m_data; -} - -bool -impl::path::operator<(const path& p) - const -{ - return std::strcmp(m_data.c_str(), p.m_data.c_str()) < 0; -} - -// ------------------------------------------------------------------------ -// The "file_info" class. -// ------------------------------------------------------------------------ - -const int impl::file_info::blk_type = 1; -const int impl::file_info::chr_type = 2; -const int impl::file_info::dir_type = 3; -const int impl::file_info::fifo_type = 4; -const int impl::file_info::lnk_type = 5; -const int impl::file_info::reg_type = 6; -const int impl::file_info::sock_type = 7; -const int impl::file_info::wht_type = 8; - -impl::file_info::file_info(const path& p) -{ - if (lstat(p.c_str(), &m_sb) == -1) - throw system_error(IMPL_NAME "::file_info", - "Cannot get information of " + p.str() + "; " + - "lstat(2) failed", errno); - - int type = m_sb.st_mode & S_IFMT; - switch (type) { - case S_IFBLK: m_type = blk_type; break; - case S_IFCHR: m_type = chr_type; break; - case S_IFDIR: m_type = dir_type; break; - case S_IFIFO: m_type = fifo_type; break; - 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); - } -} - -impl::file_info::~file_info(void) -{ -} - -dev_t -impl::file_info::get_device(void) - const -{ - return m_sb.st_dev; -} - -ino_t -impl::file_info::get_inode(void) - const -{ - return m_sb.st_ino; -} - -mode_t -impl::file_info::get_mode(void) - const -{ - return m_sb.st_mode & ~S_IFMT; -} - -off_t -impl::file_info::get_size(void) - const -{ - return m_sb.st_size; -} - -int -impl::file_info::get_type(void) - const -{ - return m_type; -} - -bool -impl::file_info::is_owner_readable(void) - const -{ - return m_sb.st_mode & S_IRUSR; -} - -bool -impl::file_info::is_owner_writable(void) - const -{ - return m_sb.st_mode & S_IWUSR; -} - -bool -impl::file_info::is_owner_executable(void) - const -{ - return m_sb.st_mode & S_IXUSR; -} - -bool -impl::file_info::is_group_readable(void) - const -{ - return m_sb.st_mode & S_IRGRP; -} - -bool -impl::file_info::is_group_writable(void) - const -{ - return m_sb.st_mode & S_IWGRP; -} - -bool -impl::file_info::is_group_executable(void) - const -{ - return m_sb.st_mode & S_IXGRP; -} - -bool -impl::file_info::is_other_readable(void) - const -{ - return m_sb.st_mode & S_IROTH; -} - -bool -impl::file_info::is_other_writable(void) - const -{ - return m_sb.st_mode & S_IWOTH; -} - -bool -impl::file_info::is_other_executable(void) - const -{ - return m_sb.st_mode & S_IXOTH; -} - -// ------------------------------------------------------------------------ -// The "directory" class. -// ------------------------------------------------------------------------ - -impl::directory::directory(const path& p) -{ - DIR* dp = ::opendir(p.c_str()); - if (dp == NULL) - throw system_error(IMPL_NAME "::directory::directory(" + - p.str() + ")", "opendir(3) failed", errno); - - struct dirent* dep; - while ((dep = ::readdir(dp)) != NULL) { - path entryp = p / dep->d_name; - insert(value_type(dep->d_name, file_info(entryp))); - } - - if (::closedir(dp) == -1) - throw system_error(IMPL_NAME "::directory::directory(" + - p.str() + ")", "closedir(3) failed", errno); -} - -std::set< std::string > -impl::directory::names(void) - const -{ - std::set< std::string > ns; - - for (const_iterator iter = begin(); iter != end(); iter++) - ns.insert((*iter).first); - - return ns; -} - -// ------------------------------------------------------------------------ -// The "temp_dir" class. -// ------------------------------------------------------------------------ - -impl::temp_dir::temp_dir(const path& p) -{ - tools::auto_array< char > buf(new char[p.str().length() + 1]); - std::strcpy(buf.get(), p.c_str()); - if (::mkdtemp(buf.get()) == NULL) - throw tools::system_error(IMPL_NAME "::temp_dir::temp_dir(" + - p.str() + ")", "mkdtemp(3) failed", - errno); - - m_path.reset(new path(buf.get())); -} - -impl::temp_dir::~temp_dir(void) -{ - cleanup(*m_path); -} - -const impl::path& -impl::temp_dir::get_path(void) - const -{ - return *m_path; -} - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -bool -impl::exists(const path& p) -{ - try { - eaccess(p, access_f); - return true; - } catch (const system_error& e) { - if (e.code() == ENOENT) - return false; - else - throw; - } -} - -bool -impl::have_prog_in_path(const std::string& prog) -{ - assert(prog.find('/') == std::string::npos); - - // Do not bother to provide a default value for PATH. If it is not - // there something is broken in the user's environment. - if (!tools::env::has("PATH")) - throw std::runtime_error("PATH not defined in the environment"); - std::vector< std::string > dirs = - tools::text::split(tools::env::get("PATH"), ":"); - - bool found = false; - for (std::vector< std::string >::const_iterator iter = dirs.begin(); - !found && iter != dirs.end(); iter++) { - const path& dir = path(*iter); - - if (is_executable(dir / prog)) - found = true; - } - return found; -} - -bool -impl::is_executable(const path& p) -{ - if (!exists(p)) - return false; - return safe_access(p, access_x, EACCES); -} - -void -impl::remove(const path& p) -{ - if (file_info(p).get_type() == file_info::dir_type) - throw tools::system_error(IMPL_NAME "::remove(" + p.str() + ")", - "Is a directory", - EPERM); - if (::unlink(p.c_str()) == -1) - throw tools::system_error(IMPL_NAME "::remove(" + p.str() + ")", - "unlink(" + p.str() + ") failed", - errno); -} - -void -impl::rmdir(const path& p) -{ - if (::rmdir(p.c_str())) { - if (errno == EEXIST) { - /* Some operating systems (e.g. OpenSolaris 200906) return - * EEXIST instead of ENOTEMPTY for non-empty directories. - * Homogenize the return value so that callers don't need - * to bother about differences in operating systems. */ - errno = ENOTEMPTY; - } - throw system_error(IMPL_NAME "::rmdir", "Cannot remove directory", - errno); - } -} - -impl::path -impl::change_directory(const path& dir) -{ - path olddir = get_current_dir(); - - if (olddir != dir) { - if (::chdir(dir.c_str()) == -1) - throw tools::system_error(IMPL_NAME "::chdir(" + dir.str() + ")", - "chdir(2) failed", errno); - } - - return olddir; -} - -void -impl::cleanup(const path& p) -{ - impl::file_info fi(p); - cleanup_aux(p, fi.get_device(), true); -} - -impl::path -impl::get_current_dir(void) -{ - std::auto_ptr< char > cwd; -#if defined(HAVE_GETCWD_DYN) - cwd.reset(getcwd(NULL, 0)); -#else - cwd.reset(getcwd(NULL, MAXPATHLEN)); -#endif - if (cwd.get() == NULL) - throw tools::system_error(IMPL_NAME "::get_current_dir()", - "getcwd() failed", errno); - - return path(cwd.get()); -} diff --git a/tools/fs.hpp b/tools/fs.hpp deleted file mode 100644 index f45f8f1f272d..000000000000 --- a/tools/fs.hpp +++ /dev/null @@ -1,377 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_FS_HPP) -#define TOOLS_FS_HPP - -extern "C" { -#include -#include -} - -#include -#include -#include -#include -#include -#include - -namespace tools { -namespace fs { - -// ------------------------------------------------------------------------ -// The "path" class. -// ------------------------------------------------------------------------ - -//! -//! \brief A class to represent a path to a file. -//! -//! The path class represents the route to a file or directory in the -//! file system. All file manipulation operations use this class to -//! represent their arguments as it takes care of normalizing user-provided -//! strings and ensures they are valid. -//! -//! It is important to note that the file pointed to by a path need not -//! exist. -//! -class path { - //! - //! \brief Internal representation of a path. - //! - std::string m_data; - -public: - //! \brief Constructs a new path from a user-provided string. - //! - //! This constructor takes a string, either provided by the program's - //! code or by the user and constructs a new path object. The string - //! is normalized to not contain multiple delimiters together and to - //! remove any trailing one. - //! - //! The input string cannot be empty. - //! - explicit path(const std::string&); - - //! - //! \brief Destructor for the path class. - //! - ~path(void); - - //! - //! \brief Returns a pointer to a C-style string representing this path. - //! - const char* c_str(void) const; - - //! - //! \brief Returns a string representing this path. - //! XXX Really needed? - //! - std::string str(void) const; - - //! - //! \brief Returns the branch path of this path. - //! - //! Calculates and returns the branch path of this path. In other - //! words, it returns what the standard ::dirname function would return. - //! - path branch_path(void) const; - - //! - //! \brief Returns the leaf name of this path. - //! - //! Calculates and returns the leaf name of this path. In other words, - //! it returns what the standard ::basename function would return. - //! - std::string leaf_name(void) const; - - //! - //! \brief Checks whether this path is absolute or not. - //! - //! Returns a boolean indicating if this is an absolute path or not; - //! i.e. if it starts with a slash. - //! - bool is_absolute(void) const; - - //! - //! \brief Checks whether this path points to the root directory or not. - //! - //! Returns a boolean indicating if this is path points to the root - //! directory or not. The checks made by this are extremely simple (so - //! the results cannot always be trusted) but they are enough for our - //! modest sanity-checking needs. I.e. "/../" could return false. - //! - bool is_root(void) const; - - //! - //! \brief Converts the path to be absolute. - //! - //! \pre The path was not absolute. - //! - path to_absolute(void) const; - - //! - //! \brief Checks if two paths are equal. - //! - bool operator==(const path&) const; - - //! - //! \brief Checks if two paths are different. - //! - bool operator!=(const path&) const; - - //! - //! \brief Concatenates a path with a string. - //! - //! Constructs a new path object that is the concatenation of the - //! left-hand path with the right-hand string. The string is normalized - //! before the concatenation, and a path delimiter is introduced between - //! the two components if needed. - //! - path operator/(const std::string&) const; - - //! - //! \brief Concatenates a path with another path. - //! - //! Constructs a new path object that is the concatenation of the - //! left-hand path with the right-hand one. A path delimiter is - //! introduced between the two components if needed. - //! - path operator/(const path&) const; - - //! - //! \brief Checks if a path has to be sorted before another one - //! lexicographically. - //! - bool operator<(const path&) const; -}; - -// ------------------------------------------------------------------------ -// The "file_info" class. -// ------------------------------------------------------------------------ - -class directory; - -//! -//! \brief A class that contains information about a file. -//! -//! The file_info class holds information about an specific file that -//! exists in the file system. -//! -class file_info { - int m_type; - struct stat m_sb; - -public: - //! - //! \brief The file's type. - //! - static const int blk_type; - static const int chr_type; - static const int dir_type; - static const int fifo_type; - static const int lnk_type; - static const int reg_type; - static const int sock_type; - static const int wht_type; - - //! - //! \brief Constructs a new file_info based on a given file. - //! - //! This constructor creates a new file_info object and fills it with - //! the data returned by ::stat when run on the given file, which must - //! exist. - //! - explicit file_info(const path&); - - //! - //! \brief The destructor. - //! - ~file_info(void); - - //! - //! \brief Returns the device containing the file. - //! - dev_t get_device(void) const; - - //! - //! \brief Returns the file's inode. - //! - ino_t get_inode(void) const; - - //! - //! \brief Returns the file's permissions. - //! - mode_t get_mode(void) const; - - //! - //! \brief Returns the file's size. - //! - off_t get_size(void) const; - - //! - //! \brief Returns the file's type. - //! - int get_type(void) const; - - //! - //! \brief Returns whether the file is readable by its owner or not. - //! - bool is_owner_readable(void) const; - - //! - //! \brief Returns whether the file is writable by its owner or not. - //! - bool is_owner_writable(void) const; - - //! - //! \brief Returns whether the file is executable by its owner or not. - //! - bool is_owner_executable(void) const; - - //! - //! \brief Returns whether the file is readable by the users belonging - //! to its group or not. - //! - bool is_group_readable(void) const; - - //! - //! \brief Returns whether the file is writable the users belonging to - //! its group or not. - //! - bool is_group_writable(void) const; - - //! - //! \brief Returns whether the file is executable by the users - //! belonging to its group or not. - //! - bool is_group_executable(void) const; - - //! - //! \brief Returns whether the file is readable by people different - //! than the owner and those belonging to the group or not. - //! - bool is_other_readable(void) const; - - //! - //! \brief Returns whether the file is write by people different - //! than the owner and those belonging to the group or not. - //! - bool is_other_writable(void) const; - - //! - //! \brief Returns whether the file is executable by people different - //! than the owner and those belonging to the group or not. - //! - bool is_other_executable(void) const; -}; - -// ------------------------------------------------------------------------ -// The "directory" class. -// ------------------------------------------------------------------------ - -//! -//! \brief A class representing a file system directory. -//! -//! The directory class represents a group of files in the file system and -//! corresponds to exactly one directory. -//! -class directory : public std::map< std::string, file_info > { -public: - //! - //! \brief Constructs a new directory. - //! - //! Constructs a new directory object representing the given path. - //! The directory must exist at creation time as the contents of the - //! class are gathered from it. - //! - directory(const path&); - - //! - //! \brief Returns the file names of the files in the directory. - //! - //! Returns the leaf names of all files contained in the directory. - //! I.e. the keys of the directory map. - //! - std::set< std::string > names(void) const; -}; - -// ------------------------------------------------------------------------ -// The "temp_dir" class. -// ------------------------------------------------------------------------ - -class temp_dir { - std::auto_ptr< tools::fs::path > m_path; - -public: - temp_dir(const tools::fs::path&); - ~temp_dir(void); - - const tools::fs::path& get_path(void) const; -}; - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -//! -//! \brief Checks if the given path exists. -//! -bool exists(const path&); - -//! -//! \brief Looks for the given program in the PATH. -//! -//! Given a program name (without slashes) looks for it in the path and -//! returns its full path name if found, otherwise an empty path. -//! -bool have_prog_in_path(const std::string&); - -//! -//! \brief Checks if the given path exists, is accessible and is executable. -//! -bool is_executable(const path&); - -//! -//! \brief Removes a given file. -//! -void remove(const path&); - -//! -//! \brief Removes an empty directory. -//! -void rmdir(const path&); - -tools::fs::path change_directory(const tools::fs::path&); -void cleanup(const tools::fs::path&); -tools::fs::path get_current_dir(void); - -} // namespace fs -} // namespace tools - -#endif // !defined(TOOLS_FS_HPP) diff --git a/tools/fs_test.cpp b/tools/fs_test.cpp deleted file mode 100644 index 5f482a4cdb0a..000000000000 --- a/tools/fs_test.cpp +++ /dev/null @@ -1,743 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include -} - -#include -#include -#include - -#include - -#include "exceptions.hpp" -#include "fs.hpp" -#include "user.hpp" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -static -void -create_file(const char *name) -{ - std::ofstream os(name); - os.close(); -} - -static -void -create_files(void) -{ - ::mkdir("files", 0755); - ::mkdir("files/dir", 0755); - - std::ofstream os("files/reg"); - os.close(); - - // TODO: Should create all other file types (blk, chr, fifo, lnk, sock) - // and test for them... but the underlying file system may not support - // most of these. Specially as we are working on /tmp, which can be - // mounted with flags such as "nodev". See how to deal with this - // situation. -} - -// ------------------------------------------------------------------------ -// Test cases for the "path" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(path_normalize); -ATF_TEST_CASE_HEAD(path_normalize) -{ - set_md_var("descr", "Tests the path's normalization"); -} -ATF_TEST_CASE_BODY(path_normalize) -{ - using tools::fs::path; - - ATF_REQUIRE_EQ(path(".").str(), "."); - ATF_REQUIRE_EQ(path("..").str(), ".."); - - ATF_REQUIRE_EQ(path("foo").str(), "foo"); - ATF_REQUIRE_EQ(path("foo/bar").str(), "foo/bar"); - ATF_REQUIRE_EQ(path("foo/bar/").str(), "foo/bar"); - - ATF_REQUIRE_EQ(path("/foo").str(), "/foo"); - ATF_REQUIRE_EQ(path("/foo/bar").str(), "/foo/bar"); - ATF_REQUIRE_EQ(path("/foo/bar/").str(), "/foo/bar"); - - ATF_REQUIRE_EQ(path("///foo").str(), "/foo"); - ATF_REQUIRE_EQ(path("///foo///bar").str(), "/foo/bar"); - ATF_REQUIRE_EQ(path("///foo///bar///").str(), "/foo/bar"); -} - -ATF_TEST_CASE(path_is_absolute); -ATF_TEST_CASE_HEAD(path_is_absolute) -{ - set_md_var("descr", "Tests the path::is_absolute function"); -} -ATF_TEST_CASE_BODY(path_is_absolute) -{ - using tools::fs::path; - - ATF_REQUIRE( path("/").is_absolute()); - ATF_REQUIRE( path("////").is_absolute()); - ATF_REQUIRE( path("////a").is_absolute()); - ATF_REQUIRE( path("//a//").is_absolute()); - ATF_REQUIRE(!path("a////").is_absolute()); - ATF_REQUIRE(!path("../foo").is_absolute()); -} - -ATF_TEST_CASE(path_is_root); -ATF_TEST_CASE_HEAD(path_is_root) -{ - set_md_var("descr", "Tests the path::is_root function"); -} -ATF_TEST_CASE_BODY(path_is_root) -{ - using tools::fs::path; - - ATF_REQUIRE( path("/").is_root()); - ATF_REQUIRE( path("////").is_root()); - ATF_REQUIRE(!path("////a").is_root()); - ATF_REQUIRE(!path("//a//").is_root()); - ATF_REQUIRE(!path("a////").is_root()); - ATF_REQUIRE(!path("../foo").is_root()); -} - -ATF_TEST_CASE(path_branch_path); -ATF_TEST_CASE_HEAD(path_branch_path) -{ - set_md_var("descr", "Tests the path::branch_path function"); -} -ATF_TEST_CASE_BODY(path_branch_path) -{ - using tools::fs::path; - - ATF_REQUIRE_EQ(path(".").branch_path().str(), "."); - ATF_REQUIRE_EQ(path("foo").branch_path().str(), "."); - ATF_REQUIRE_EQ(path("foo/bar").branch_path().str(), "foo"); - ATF_REQUIRE_EQ(path("/foo").branch_path().str(), "/"); - ATF_REQUIRE_EQ(path("/foo/bar").branch_path().str(), "/foo"); -} - -ATF_TEST_CASE(path_leaf_name); -ATF_TEST_CASE_HEAD(path_leaf_name) -{ - set_md_var("descr", "Tests the path::leaf_name function"); -} -ATF_TEST_CASE_BODY(path_leaf_name) -{ - using tools::fs::path; - - ATF_REQUIRE_EQ(path(".").leaf_name(), "."); - ATF_REQUIRE_EQ(path("foo").leaf_name(), "foo"); - ATF_REQUIRE_EQ(path("foo/bar").leaf_name(), "bar"); - ATF_REQUIRE_EQ(path("/foo").leaf_name(), "foo"); - ATF_REQUIRE_EQ(path("/foo/bar").leaf_name(), "bar"); -} - -ATF_TEST_CASE(path_compare_equal); -ATF_TEST_CASE_HEAD(path_compare_equal) -{ - set_md_var("descr", "Tests the comparison for equality between paths"); -} -ATF_TEST_CASE_BODY(path_compare_equal) -{ - using tools::fs::path; - - ATF_REQUIRE(path("/") == path("///")); - ATF_REQUIRE(path("/a") == path("///a")); - ATF_REQUIRE(path("/a") == path("///a///")); - - ATF_REQUIRE(path("a/b/c") == path("a//b//c")); - ATF_REQUIRE(path("a/b/c") == path("a//b//c///")); -} - -ATF_TEST_CASE(path_compare_different); -ATF_TEST_CASE_HEAD(path_compare_different) -{ - set_md_var("descr", "Tests the comparison for difference between paths"); -} -ATF_TEST_CASE_BODY(path_compare_different) -{ - using tools::fs::path; - - ATF_REQUIRE(path("/") != path("//a/")); - ATF_REQUIRE(path("/a") != path("a///")); - - ATF_REQUIRE(path("a/b/c") != path("a/b")); - ATF_REQUIRE(path("a/b/c") != path("a//b")); - ATF_REQUIRE(path("a/b/c") != path("/a/b/c")); - ATF_REQUIRE(path("a/b/c") != path("/a//b//c")); -} - -ATF_TEST_CASE(path_concat); -ATF_TEST_CASE_HEAD(path_concat) -{ - set_md_var("descr", "Tests the concatenation of multiple paths"); -} -ATF_TEST_CASE_BODY(path_concat) -{ - using tools::fs::path; - - ATF_REQUIRE_EQ((path("foo") / "bar").str(), "foo/bar"); - ATF_REQUIRE_EQ((path("foo/") / "/bar").str(), "foo/bar"); - ATF_REQUIRE_EQ((path("foo/") / "/bar/baz").str(), "foo/bar/baz"); - ATF_REQUIRE_EQ((path("foo/") / "///bar///baz").str(), "foo/bar/baz"); -} - -ATF_TEST_CASE(path_to_absolute); -ATF_TEST_CASE_HEAD(path_to_absolute) -{ - set_md_var("descr", "Tests the conversion of a relative path to an " - "absolute one"); -} -ATF_TEST_CASE_BODY(path_to_absolute) -{ - using tools::fs::file_info; - using tools::fs::path; - - create_files(); - - { - const path p("."); - path pa = p.to_absolute(); - ATF_REQUIRE(pa.is_absolute()); - - file_info fi(p); - file_info fia(pa); - ATF_REQUIRE_EQ(fi.get_device(), fia.get_device()); - ATF_REQUIRE_EQ(fi.get_inode(), fia.get_inode()); - } - - { - const path p("files/reg"); - path pa = p.to_absolute(); - ATF_REQUIRE(pa.is_absolute()); - - file_info fi(p); - file_info fia(pa); - ATF_REQUIRE_EQ(fi.get_device(), fia.get_device()); - ATF_REQUIRE_EQ(fi.get_inode(), fia.get_inode()); - } -} - -ATF_TEST_CASE(path_op_less); -ATF_TEST_CASE_HEAD(path_op_less) -{ - set_md_var("descr", "Tests that the path's less-than operator works"); -} -ATF_TEST_CASE_BODY(path_op_less) -{ - using tools::fs::path; - - create_files(); - - ATF_REQUIRE(!(path("aaa") < path("aaa"))); - - ATF_REQUIRE( path("aab") < path("abc")); - ATF_REQUIRE(!(path("abc") < path("aab"))); -} - -// ------------------------------------------------------------------------ -// Test cases for the "directory" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(directory_read); -ATF_TEST_CASE_HEAD(directory_read) -{ - set_md_var("descr", "Tests the directory class creation, which reads " - "the contents of a directory"); -} -ATF_TEST_CASE_BODY(directory_read) -{ - using tools::fs::directory; - using tools::fs::path; - - create_files(); - - directory d(path("files")); - ATF_REQUIRE_EQ(d.size(), 4); - ATF_REQUIRE(d.find(".") != d.end()); - ATF_REQUIRE(d.find("..") != d.end()); - ATF_REQUIRE(d.find("dir") != d.end()); - ATF_REQUIRE(d.find("reg") != d.end()); -} - -ATF_TEST_CASE(directory_file_info); -ATF_TEST_CASE_HEAD(directory_file_info) -{ - set_md_var("descr", "Tests that the file_info objects attached to the " - "directory are valid"); -} -ATF_TEST_CASE_BODY(directory_file_info) -{ - using tools::fs::directory; - using tools::fs::file_info; - using tools::fs::path; - - create_files(); - - directory d(path("files")); - - { - directory::const_iterator iter = d.find("dir"); - ATF_REQUIRE(iter != d.end()); - const file_info& fi = (*iter).second; - ATF_REQUIRE(fi.get_type() == file_info::dir_type); - } - - { - directory::const_iterator iter = d.find("reg"); - ATF_REQUIRE(iter != d.end()); - const file_info& fi = (*iter).second; - ATF_REQUIRE(fi.get_type() == file_info::reg_type); - } -} - -ATF_TEST_CASE(directory_names); -ATF_TEST_CASE_HEAD(directory_names) -{ - set_md_var("descr", "Tests the directory's names method"); -} -ATF_TEST_CASE_BODY(directory_names) -{ - using tools::fs::directory; - using tools::fs::path; - - create_files(); - - directory d(path("files")); - std::set< std::string > ns = d.names(); - ATF_REQUIRE_EQ(ns.size(), 4); - ATF_REQUIRE(ns.find(".") != ns.end()); - ATF_REQUIRE(ns.find("..") != ns.end()); - ATF_REQUIRE(ns.find("dir") != ns.end()); - ATF_REQUIRE(ns.find("reg") != ns.end()); -} - -// ------------------------------------------------------------------------ -// Test cases for the "file_info" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(file_info_stat); -ATF_TEST_CASE_HEAD(file_info_stat) -{ - set_md_var("descr", "Tests the file_info creation and its basic contents"); -} -ATF_TEST_CASE_BODY(file_info_stat) -{ - using tools::fs::file_info; - using tools::fs::path; - - create_files(); - - { - path p("files/dir"); - file_info fi(p); - ATF_REQUIRE(fi.get_type() == file_info::dir_type); - } - - { - path p("files/reg"); - file_info fi(p); - ATF_REQUIRE(fi.get_type() == file_info::reg_type); - } -} - -ATF_TEST_CASE(file_info_perms); -ATF_TEST_CASE_HEAD(file_info_perms) -{ - set_md_var("descr", "Tests the file_info methods to get the file's " - "permissions"); -} -ATF_TEST_CASE_BODY(file_info_perms) -{ - using tools::fs::file_info; - using tools::fs::path; - - path p("file"); - - std::ofstream os(p.c_str()); - os.close(); - -#define perms(ur, uw, ux, gr, gw, gx, othr, othw, othx) \ - { \ - file_info fi(p); \ - ATF_REQUIRE(fi.is_owner_readable() == ur); \ - ATF_REQUIRE(fi.is_owner_writable() == uw); \ - ATF_REQUIRE(fi.is_owner_executable() == ux); \ - ATF_REQUIRE(fi.is_group_readable() == gr); \ - ATF_REQUIRE(fi.is_group_writable() == gw); \ - ATF_REQUIRE(fi.is_group_executable() == gx); \ - ATF_REQUIRE(fi.is_other_readable() == othr); \ - ATF_REQUIRE(fi.is_other_writable() == othw); \ - ATF_REQUIRE(fi.is_other_executable() == othx); \ - } - - ::chmod(p.c_str(), 0000); - perms(false, false, false, false, false, false, false, false, false); - - ::chmod(p.c_str(), 0001); - perms(false, false, false, false, false, false, false, false, true); - - ::chmod(p.c_str(), 0010); - perms(false, false, false, false, false, true, false, false, false); - - ::chmod(p.c_str(), 0100); - perms(false, false, true, false, false, false, false, false, false); - - ::chmod(p.c_str(), 0002); - perms(false, false, false, false, false, false, false, true, false); - - ::chmod(p.c_str(), 0020); - perms(false, false, false, false, true, false, false, false, false); - - ::chmod(p.c_str(), 0200); - perms(false, true, false, false, false, false, false, false, false); - - ::chmod(p.c_str(), 0004); - perms(false, false, false, false, false, false, true, false, false); - - ::chmod(p.c_str(), 0040); - perms(false, false, false, true, false, false, false, false, false); - - ::chmod(p.c_str(), 0400); - perms(true, false, false, false, false, false, false, false, false); - - ::chmod(p.c_str(), 0644); - perms(true, true, false, true, false, false, true, false, false); - - ::chmod(p.c_str(), 0755); - perms(true, true, true, true, false, true, true, false, true); - - ::chmod(p.c_str(), 0777); - perms(true, true, true, true, true, true, true, true, true); - -#undef perms -} - -// ------------------------------------------------------------------------ -// Test cases for the "temp_dir" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(temp_dir_raii); -ATF_TEST_CASE_HEAD(temp_dir_raii) -{ - set_md_var("descr", "Tests the RAII behavior of the temp_dir class"); -} -ATF_TEST_CASE_BODY(temp_dir_raii) -{ - tools::fs::path t1("non-existent"); - tools::fs::path t2("non-existent"); - - { - tools::fs::path tmpl("testdir.XXXXXX"); - tools::fs::temp_dir td1(tmpl); - tools::fs::temp_dir td2(tmpl); - t1 = td1.get_path(); - t2 = td2.get_path(); - ATF_REQUIRE(t1.str().find("XXXXXX") == std::string::npos); - ATF_REQUIRE(t2.str().find("XXXXXX") == std::string::npos); - ATF_REQUIRE(t1 != t2); - ATF_REQUIRE(!tools::fs::exists(tmpl)); - ATF_REQUIRE( tools::fs::exists(t1)); - ATF_REQUIRE( tools::fs::exists(t2)); - - tools::fs::file_info fi1(t1); - ATF_REQUIRE( fi1.is_owner_readable()); - ATF_REQUIRE( fi1.is_owner_writable()); - ATF_REQUIRE( fi1.is_owner_executable()); - ATF_REQUIRE(!fi1.is_group_readable()); - ATF_REQUIRE(!fi1.is_group_writable()); - ATF_REQUIRE(!fi1.is_group_executable()); - ATF_REQUIRE(!fi1.is_other_readable()); - ATF_REQUIRE(!fi1.is_other_writable()); - ATF_REQUIRE(!fi1.is_other_executable()); - - tools::fs::file_info fi2(t2); - ATF_REQUIRE( fi2.is_owner_readable()); - ATF_REQUIRE( fi2.is_owner_writable()); - ATF_REQUIRE( fi2.is_owner_executable()); - ATF_REQUIRE(!fi2.is_group_readable()); - ATF_REQUIRE(!fi2.is_group_writable()); - ATF_REQUIRE(!fi2.is_group_executable()); - ATF_REQUIRE(!fi2.is_other_readable()); - ATF_REQUIRE(!fi2.is_other_writable()); - ATF_REQUIRE(!fi2.is_other_executable()); - } - - ATF_REQUIRE(t1.str() != "non-existent"); - ATF_REQUIRE(!tools::fs::exists(t1)); - ATF_REQUIRE(t2.str() != "non-existent"); - ATF_REQUIRE(!tools::fs::exists(t2)); -} - - -// ------------------------------------------------------------------------ -// Test cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(exists); -ATF_TEST_CASE_HEAD(exists) -{ - set_md_var("descr", "Tests the exists function"); -} -ATF_TEST_CASE_BODY(exists) -{ - using tools::fs::exists; - using tools::fs::path; - - create_files(); - - ATF_REQUIRE( exists(path("files"))); - ATF_REQUIRE(!exists(path("file"))); - ATF_REQUIRE(!exists(path("files2"))); - - ATF_REQUIRE( exists(path("files/."))); - ATF_REQUIRE( exists(path("files/.."))); - ATF_REQUIRE( exists(path("files/dir"))); - ATF_REQUIRE( exists(path("files/reg"))); - ATF_REQUIRE(!exists(path("files/foo"))); -} - -ATF_TEST_CASE(is_executable); -ATF_TEST_CASE_HEAD(is_executable) -{ - set_md_var("descr", "Tests the is_executable function"); -} -ATF_TEST_CASE_BODY(is_executable) -{ - using tools::fs::is_executable; - using tools::fs::path; - - create_files(); - - ATF_REQUIRE( is_executable(path("files"))); - ATF_REQUIRE( is_executable(path("files/."))); - ATF_REQUIRE( is_executable(path("files/.."))); - ATF_REQUIRE( is_executable(path("files/dir"))); - - ATF_REQUIRE(!is_executable(path("non-existent"))); - - ATF_REQUIRE(!is_executable(path("files/reg"))); - ATF_REQUIRE(::chmod("files/reg", 0755) != -1); - ATF_REQUIRE( is_executable(path("files/reg"))); -} - -ATF_TEST_CASE(remove); -ATF_TEST_CASE_HEAD(remove) -{ - set_md_var("descr", "Tests the remove function"); -} -ATF_TEST_CASE_BODY(remove) -{ - using tools::fs::exists; - using tools::fs::path; - using tools::fs::remove; - - create_files(); - - ATF_REQUIRE( exists(path("files/reg"))); - remove(path("files/reg")); - ATF_REQUIRE(!exists(path("files/reg"))); - - ATF_REQUIRE( exists(path("files/dir"))); - ATF_REQUIRE_THROW(tools::system_error, remove(path("files/dir"))); - ATF_REQUIRE( exists(path("files/dir"))); -} - -ATF_TEST_CASE(cleanup); -ATF_TEST_CASE_HEAD(cleanup) -{ - set_md_var("descr", "Tests the cleanup function"); -} -ATF_TEST_CASE_BODY(cleanup) -{ - using tools::fs::cleanup; - - ::mkdir("root", 0755); - ::mkdir("root/dir", 0755); - ::mkdir("root/dir/1", 0100); - ::mkdir("root/dir/2", 0644); - create_file("root/reg"); - - tools::fs::path p("root"); - ATF_REQUIRE(tools::fs::exists(p)); - ATF_REQUIRE(tools::fs::exists(p / "dir")); - ATF_REQUIRE(tools::fs::exists(p / "dir/1")); - ATF_REQUIRE(tools::fs::exists(p / "dir/2")); - ATF_REQUIRE(tools::fs::exists(p / "reg")); - cleanup(p); - ATF_REQUIRE(!tools::fs::exists(p)); -} - -ATF_TEST_CASE(cleanup_eacces_on_root); -ATF_TEST_CASE_HEAD(cleanup_eacces_on_root) -{ - set_md_var("descr", "Tests the cleanup function"); -} -ATF_TEST_CASE_BODY(cleanup_eacces_on_root) -{ - using tools::fs::cleanup; - - ::mkdir("aux", 0755); - ::mkdir("aux/root", 0755); - ATF_REQUIRE(::chmod("aux", 0555) != -1); - - try { - cleanup(tools::fs::path("aux/root")); - ATF_REQUIRE(tools::user::is_root()); - } catch (const tools::system_error& e) { - ATF_REQUIRE(!tools::user::is_root()); - ATF_REQUIRE_EQ(EACCES, e.code()); - } -} - -ATF_TEST_CASE(cleanup_eacces_on_subdir); -ATF_TEST_CASE_HEAD(cleanup_eacces_on_subdir) -{ - set_md_var("descr", "Tests the cleanup function"); -} -ATF_TEST_CASE_BODY(cleanup_eacces_on_subdir) -{ - using tools::fs::cleanup; - - ::mkdir("root", 0755); - ::mkdir("root/1", 0755); - ::mkdir("root/1/2", 0755); - ::mkdir("root/1/2/3", 0755); - ATF_REQUIRE(::chmod("root/1/2", 0555) != -1); - ATF_REQUIRE(::chmod("root/1", 0555) != -1); - - const tools::fs::path p("root"); - cleanup(p); - ATF_REQUIRE(!tools::fs::exists(p)); -} - -ATF_TEST_CASE(change_directory); -ATF_TEST_CASE_HEAD(change_directory) -{ - set_md_var("descr", "Tests the change_directory function"); -} -ATF_TEST_CASE_BODY(change_directory) -{ - using tools::fs::change_directory; - using tools::fs::get_current_dir; - - ::mkdir("files", 0755); - ::mkdir("files/dir", 0755); - create_file("files/reg"); - - const tools::fs::path old = get_current_dir(); - - ATF_REQUIRE_THROW(tools::system_error, - change_directory(tools::fs::path("files/reg"))); - ATF_REQUIRE(get_current_dir() == old); - - tools::fs::path old2 = change_directory(tools::fs::path("files")); - ATF_REQUIRE(old2 == old); - tools::fs::path old3 = change_directory(tools::fs::path("dir")); - ATF_REQUIRE(old3 == old2 / "files"); - tools::fs::path old4 = change_directory(tools::fs::path("../..")); - ATF_REQUIRE(old4 == old3 / "dir"); - ATF_REQUIRE(get_current_dir() == old); -} - -ATF_TEST_CASE(get_current_dir); -ATF_TEST_CASE_HEAD(get_current_dir) -{ - set_md_var("descr", "Tests the get_current_dir function"); -} -ATF_TEST_CASE_BODY(get_current_dir) -{ - using tools::fs::change_directory; - using tools::fs::get_current_dir; - - ::mkdir("files", 0755); - ::mkdir("files/dir", 0755); - create_file("files/reg"); - - tools::fs::path curdir = get_current_dir(); - change_directory(tools::fs::path(".")); - ATF_REQUIRE(get_current_dir() == curdir); - change_directory(tools::fs::path("files")); - ATF_REQUIRE(get_current_dir() == curdir / "files"); - change_directory(tools::fs::path("dir")); - ATF_REQUIRE(get_current_dir() == curdir / "files/dir"); - change_directory(tools::fs::path("..")); - ATF_REQUIRE(get_current_dir() == curdir / "files"); - change_directory(tools::fs::path("..")); - ATF_REQUIRE(get_current_dir() == curdir); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the tests for the "path" class. - ATF_ADD_TEST_CASE(tcs, path_normalize); - ATF_ADD_TEST_CASE(tcs, path_is_absolute); - ATF_ADD_TEST_CASE(tcs, path_is_root); - ATF_ADD_TEST_CASE(tcs, path_branch_path); - ATF_ADD_TEST_CASE(tcs, path_leaf_name); - ATF_ADD_TEST_CASE(tcs, path_compare_equal); - ATF_ADD_TEST_CASE(tcs, path_compare_different); - ATF_ADD_TEST_CASE(tcs, path_concat); - ATF_ADD_TEST_CASE(tcs, path_to_absolute); - ATF_ADD_TEST_CASE(tcs, path_op_less); - - // Add the tests for the "file_info" class. - ATF_ADD_TEST_CASE(tcs, file_info_stat); - ATF_ADD_TEST_CASE(tcs, file_info_perms); - - // Add the tests for the "directory" class. - ATF_ADD_TEST_CASE(tcs, directory_read); - ATF_ADD_TEST_CASE(tcs, directory_names); - ATF_ADD_TEST_CASE(tcs, directory_file_info); - - // Add the tests for the "temp_dir" class. - ATF_ADD_TEST_CASE(tcs, temp_dir_raii); - - // Add the tests for the free functions. - ATF_ADD_TEST_CASE(tcs, exists); - ATF_ADD_TEST_CASE(tcs, is_executable); - ATF_ADD_TEST_CASE(tcs, remove); - ATF_ADD_TEST_CASE(tcs, cleanup); - ATF_ADD_TEST_CASE(tcs, cleanup_eacces_on_root); - ATF_ADD_TEST_CASE(tcs, cleanup_eacces_on_subdir); - ATF_ADD_TEST_CASE(tcs, change_directory); - ATF_ADD_TEST_CASE(tcs, get_current_dir); -} diff --git a/tools/generate-revision.sh b/tools/generate-revision.sh deleted file mode 100755 index 169be85f941a..000000000000 --- a/tools/generate-revision.sh +++ /dev/null @@ -1,142 +0,0 @@ -#! /bin/sh -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# Generates a header file with information about the revision used to -# build ATF. -# - -set -e - -Prog_Name=${0##*/} - -GIT= -ROOT= - -# -# err message -# -err() { - echo "${Prog_Name}: ${@}" 1>&2 - exit 1 -} - -# -# call_git args -# -call_git() { - ( cd "${ROOT}" && "${GIT}" "${@}" ) -} - -# -# generate_from_dist revfile version -# -generate_from_dist() { - revfile=${1}; shift - version=${1}; shift - - >${revfile} - - echo "#define PACKAGE_REVISION_TYPE_DIST" >>${revfile} -} - -# -# generate_from_git revfile -# -generate_from_git() { - revfile=${1} - - rev_base_id=$(call_git rev-parse HEAD) - rev_branch=$(call_git branch | grep '^\* ' | cut -d ' ' -f 2-) - rev_date=$(call_git log -1 | grep '^Date:' | sed -e 's,^Date:[ \t]*,,') - if [ -z "$(call_git status -s)" ]; then - rev_modified=false - else - rev_modified=true - fi - - >${revfile} - - echo "#define PACKAGE_REVISION_TYPE_GIT" >>${revfile} - - echo "#define PACKAGE_REVISION_BRANCH \"${rev_branch}\"" >>${revfile} - echo "#define PACKAGE_REVISION_BASE \"${rev_base_id}\"" >>${revfile} - - if [ ${rev_modified} = true ]; then - echo "#define PACKAGE_REVISION_MODIFIED 1" >>${revfile} - fi - - echo "#define PACKAGE_REVISION_DATE \"${rev_date}\"" >>${revfile} -} - -# -# main -# -# Entry point. -# -main() { - outfile= - version= - while getopts :g:r:o:v: arg; do - case ${arg} in - g) - GIT=${OPTARG} - ;; - o) - outfile=${OPTARG} - ;; - r) - ROOT=${OPTARG} - ;; - v) - version=${OPTARG} - ;; - *) - err "Unknown option ${arg}" - ;; - esac - done - [ -n "${ROOT}" ] || \ - err "Must specify the top-level source directory with -r" - [ -n "${outfile}" ] || \ - err "Must specify an output file with -o" - [ -n "${version}" ] || \ - err "Must specify a version number with -v" - - if [ -n "${GIT}" -a -d ${ROOT}/.git ]; then - generate_from_git ${outfile} - else - generate_from_dist ${outfile} ${version} - fi -} - -main "${@}" - -# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 diff --git a/tools/io.cpp b/tools/io.cpp deleted file mode 100644 index 4cf8f6a4bfaa..000000000000 --- a/tools/io.cpp +++ /dev/null @@ -1,356 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include -#include -#include -} - -#include -#include -#include - -#include "auto_array.hpp" -#include "exceptions.hpp" -#include "io.hpp" - -namespace impl = tools::io; -#define IMPL_NAME "tools::io" - -// ------------------------------------------------------------------------ -// The "file_handle" class. -// ------------------------------------------------------------------------ - -impl::file_handle::file_handle(void) : - m_handle(invalid_value()) -{ -} - -impl::file_handle::file_handle(handle_type h) : - m_handle(h) -{ - assert(m_handle != invalid_value()); -} - -impl::file_handle::file_handle(const file_handle& fh) : - m_handle(fh.m_handle) -{ - fh.m_handle = invalid_value(); -} - -impl::file_handle::~file_handle(void) -{ - if (is_valid()) - close(); -} - -impl::file_handle& -impl::file_handle::operator=(const file_handle& fh) -{ - m_handle = fh.m_handle; - fh.m_handle = invalid_value(); - - return *this; -} - -bool -impl::file_handle::is_valid(void) - const -{ - return m_handle != invalid_value(); -} - -void -impl::file_handle::close(void) -{ - assert(is_valid()); - - ::close(m_handle); - - m_handle = invalid_value(); -} - -impl::file_handle::handle_type -impl::file_handle::disown(void) -{ - assert(is_valid()); - - handle_type h = m_handle; - m_handle = invalid_value(); - return h; -} - -impl::file_handle::handle_type -impl::file_handle::get(void) - const -{ - assert(is_valid()); - - return m_handle; -} - -void -impl::file_handle::posix_remap(handle_type h) -{ - assert(is_valid()); - - if (m_handle == h) - return; - - if (::dup2(m_handle, h) == -1) - throw tools::system_error(IMPL_NAME "::file_handle::posix_remap", - "dup2(2) failed", errno); - - if (::close(m_handle) == -1) { - ::close(h); - throw tools::system_error(IMPL_NAME "::file_handle::posix_remap", - "close(2) failed", errno); - } - - m_handle = h; -} - -impl::file_handle::handle_type -impl::file_handle::invalid_value(void) -{ - return -1; -} - -// ------------------------------------------------------------------------ -// The "systembuf" class. -// ------------------------------------------------------------------------ - -impl::systembuf::systembuf(handle_type h, std::size_t bufsize) : - m_handle(h), - m_bufsize(bufsize), - m_read_buf(NULL), - m_write_buf(NULL) -{ - assert(m_handle >= 0); - assert(m_bufsize > 0); - - try { - m_read_buf = new char[bufsize]; - m_write_buf = new char[bufsize]; - } catch (...) { - if (m_read_buf != NULL) - delete [] m_read_buf; - if (m_write_buf != NULL) - delete [] m_write_buf; - throw; - } - - setp(m_write_buf, m_write_buf + m_bufsize); -} - -impl::systembuf::~systembuf(void) -{ - delete [] m_read_buf; - delete [] m_write_buf; -} - -impl::systembuf::int_type -impl::systembuf::underflow(void) -{ - assert(gptr() >= egptr()); - - bool ok; - ssize_t cnt = ::read(m_handle, m_read_buf, m_bufsize); - ok = (cnt != -1 && cnt != 0); - - if (!ok) - return traits_type::eof(); - else { - setg(m_read_buf, m_read_buf, m_read_buf + cnt); - return traits_type::to_int_type(*gptr()); - } -} - -impl::systembuf::int_type -impl::systembuf::overflow(int c) -{ - assert(pptr() >= epptr()); - if (sync() == -1) - return traits_type::eof(); - if (!traits_type::eq_int_type(c, traits_type::eof())) { - traits_type::assign(*pptr(), c); - pbump(1); - } - return traits_type::not_eof(c); -} - -int -impl::systembuf::sync(void) -{ - ssize_t cnt = pptr() - pbase(); - - bool ok; - ok = ::write(m_handle, pbase(), cnt) == cnt; - - if (ok) - pbump(-cnt); - return ok ? 0 : -1; -} - -// ------------------------------------------------------------------------ -// The "pistream" class. -// ------------------------------------------------------------------------ - -impl::pistream::pistream(const int fd) : - std::istream(NULL), - m_systembuf(fd) -{ - rdbuf(&m_systembuf); -} - -// ------------------------------------------------------------------------ -// The "muxer" class. -// ------------------------------------------------------------------------ - -static int -safe_poll(struct pollfd fds[], nfds_t nfds, int timeout) -{ - int ret = ::poll(fds, nfds, timeout); - if (ret == -1) { - if (errno == EINTR) - ret = 0; - else - throw tools::system_error(IMPL_NAME "::safe_poll", "poll(2) failed", - errno); - } - assert(ret >= 0); - return ret; -} - -static size_t -safe_read(const int fd, void* buffer, const size_t nbytes, - const bool report_errors) -{ - int ret; - while ((ret = ::read(fd, buffer, nbytes)) == -1 && errno == EINTR) {} - if (ret == -1) { - assert(errno != EINTR); - - if (report_errors) - throw tools::system_error(IMPL_NAME "::safe_read", "read(2) failed", - errno); - else - ret = 0; - } - assert(ret >= 0); - return static_cast< size_t >(ret); -} - -impl::muxer::muxer(const int* fds, const size_t nfds, const size_t bufsize) : - m_fds(fds), - m_nfds(nfds), - m_bufsize(bufsize), - m_buffers(new std::string[nfds]) -{ -} - -impl::muxer::~muxer(void) -{ -} - -size_t -impl::muxer::read_one(const size_t index, const int fd, std::string& accum, - const bool report_errors) -{ - tools::auto_array< char > buffer(new char[m_bufsize]); - const size_t nbytes = safe_read(fd, buffer.get(), m_bufsize - 1, - report_errors); - assert(nbytes < m_bufsize); - buffer[nbytes] = '\0'; - - std::string line(accum); - - size_t line_start = 0; - for (size_t i = 0; i < nbytes; i++) { - if (buffer[i] == '\n') { - line_callback(index, line); - line.clear(); - accum.clear(); - line_start = i + 1; - } else if (buffer[i] == '\r') { - // Do nothing. - } else { - line.append(1, buffer[i]); - } - } - accum.append(&buffer[line_start]); - - return nbytes; -} - -void -impl::muxer::mux(volatile const bool& terminate) -{ - tools::auto_array< struct pollfd > poll_fds(new struct pollfd[m_nfds]); - for (size_t i = 0; i < m_nfds; i++) { - poll_fds[i].fd = m_fds[i]; - poll_fds[i].events = POLLIN; - } - - size_t nactive = m_nfds; - while (nactive > 0 && !terminate) { - int ret; - while (!terminate && (ret = safe_poll(poll_fds.get(), 2, 250)) == 0) {} - - for (size_t i = 0; !terminate && i < m_nfds; i++) { - if (poll_fds[i].events == 0) - continue; - - if (poll_fds[i].revents & POLLHUP) { - // Any data still available at this point will be processed by - // a call to the flush method. - poll_fds[i].events = 0; - - assert(nactive >= 1); - nactive--; - } else if (poll_fds[i].revents & (POLLIN | POLLRDNORM | POLLRDBAND | - POLLPRI)) { - (void)read_one(i, poll_fds[i].fd, m_buffers[i], true); - } - } - } -} - -void -impl::muxer::flush(void) -{ - for (size_t i = 0; i < m_nfds; i++) { - while (read_one(i, m_fds[i], m_buffers[i], false) > 0) {} - - if (!m_buffers[i].empty()) - line_callback(i, m_buffers[i]); - } -} diff --git a/tools/io.hpp b/tools/io.hpp deleted file mode 100644 index 3fb417b8db85..000000000000 --- a/tools/io.hpp +++ /dev/null @@ -1,436 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_IO_HPP) -#define TOOLS_IO_HPP - -#include -#include -#include - -#include "auto_array.hpp" -#include "fs.hpp" - -namespace tools { -namespace io { - -// ------------------------------------------------------------------------ -// The "file_handle" class. -// ------------------------------------------------------------------------ - -//! -//! \brief Simple RAII model for system file handles. -//! -//! The \a file_handle class is a simple RAII model for native system file -//! handles. This class wraps one of such handles grabbing its ownership, -//! and automaticaly closes it upon destruction. It is basically used -//! inside the library to avoid leaking open file handles, shall an -//! unexpected execution trace occur. -//! -//! A \a file_handle object can be copied but doing so invalidates the -//! source object. There can only be a single valid \a file_handle object -//! for a given system file handle. This is similar to std::auto_ptr\<\>'s -//! semantics. -//! -//! This class also provides some convenience methods to issue special file -//! operations under their respective platforms. -//! -class file_handle -{ -public: - //! - //! \brief Opaque name for the native handle type. - //! - //! Each operating system identifies file handles using a specific type. - //! The \a handle_type type is used to transparently refer to file - //! handles regarless of the operating system in which this class is - //! used. - //! - //! If this class is used in a POSIX system, \a NativeSystemHandle is - //! an integer type while it is a \a HANDLE in a Win32 system. - //! - typedef int handle_type; - - //! - //! \brief Constructs an invalid file handle. - //! - //! This constructor creates a new \a file_handle object that represents - //! an invalid file handle. An invalid file handle can be copied but - //! cannot be manipulated in any way (except checking for its validity). - //! - //! \see is_valid() - //! - file_handle(void); - - //! - //! \brief Constructs a new file handle from a native file handle. - //! - //! This constructor creates a new \a file_handle object that takes - //! ownership of the given \a h native file handle. The user must not - //! close \a h on his own during the lifetime of the new object. - //! Ownership can be reclaimed using disown(). - //! - //! \pre The native file handle must be valid; a close operation must - //! succeed on it. - //! - //! \see disown() - //! - file_handle(handle_type h); - - //! - //! \brief Copy constructor; invalidates the source handle. - //! - //! This copy constructor creates a new file handle from a given one. - //! Ownership of the native file handle is transferred to the new - //! object, effectively invalidating the source file handle. This - //! avoids having two live \a file_handle objects referring to the - //! same native file handle. The source file handle need not be - //! valid in the name of simplicity. - //! - //! \post The source file handle is invalid. - //! \post The new file handle owns the source's native file handle. - //! - file_handle(const file_handle& fh); - - //! - //! \brief Releases resources if the handle is valid. - //! - //! If the file handle is valid, the destructor closes it. - //! - //! \see is_valid() - //! - ~file_handle(void); - - //! - //! \brief Assignment operator; invalidates the source handle. - //! - //! This assignment operator transfers ownership of the RHS file - //! handle to the LHS one, effectively invalidating the source file - //! handle. This avoids having two live \a file_handle objects - //! referring to the same native file handle. The source file - //! handle need not be valid in the name of simplicity. - //! - //! \post The RHS file handle is invalid. - //! \post The LHS file handle owns RHS' native file handle. - //! \return A reference to the LHS file handle. - //! - file_handle& operator=(const file_handle& fh); - - //! - //! \brief Checks whether the file handle is valid or not. - //! - //! Returns a boolean indicating whether the file handle is valid or - //! not. If the file handle is invalid, no other applications can be - //! executed other than the destructor. - //! - //! \return True if the file handle is valid; false otherwise. - //! - bool is_valid(void) const; - - //! - //! \brief Closes the file handle. - //! - //! Explicitly closes the file handle, which must be valid. Upon - //! exit, the handle is not valid any more. - //! - //! \pre The file handle is valid. - //! \post The file handle is invalid. - //! \post The native file handle is closed. - //! - void close(void); - - //! - //! \brief Reclaims ownership of the native file handle. - //! - //! Explicitly reclaims ownership of the native file handle contained - //! in the \a file_handle object, returning the native file handle. - //! The caller is responsible of closing it later on. - //! - //! \pre The file handle is valid. - //! \post The file handle is invalid. - //! \return The native file handle. - //! - handle_type disown(void); - - //! - //! \brief Gets the native file handle. - //! - //! Returns the native file handle for the \a file_handle object. - //! The caller can issue any operation on it except closing it. - //! If closing is required, disown() shall be used. - //! - //! \pre The file handle is valid. - //! \return The native file handle. - //! - handle_type get(void) const; - - //! - //! \brief Changes the native file handle to the given one. - //! - //! Given a new native file handle \a h, this operation assigns this - //! handle to the current object, closing its old native file handle. - //! In other words, it first calls dup2() to remap the old handle to - //! the new one and then closes the old handle. - //! - //! If \a h matches the current value of the handle, this is a no-op. - //! This is done for simplicity, to avoid the caller having to check - //! this condition on its own. - //! - //! If \a h is open, it is automatically closed by dup2(). - //! - //! This operation is only available in POSIX systems. - //! - //! \pre The file handle is valid. - //! \pre The native file handle \a h is valid; i.e., it must be - //! closeable. - //! \post The file handle's native file handle is \a h. - //! \throw system_error If the internal remapping operation fails. - //! - void posix_remap(handle_type h); - -private: - //! - //! \brief Internal handle value. - //! - //! This variable holds the native handle value for the file handle - //! hold by this object. It is interesting to note that this needs - //! to be mutable because the copy constructor and the assignment - //! operator invalidate the source object. - //! - mutable handle_type m_handle; - - //! - //! \brief Constant function representing an invalid handle value. - //! - //! Returns the platform-specific handle value that represents an - //! invalid handle. This is a constant function rather than a regular - //! constant because, in the latter case, we cannot define it under - //! Win32 due to the value being of a complex type. - //! - static handle_type invalid_value(void); -}; - -// ------------------------------------------------------------------------ -// The "systembuf" class. -// ------------------------------------------------------------------------ - -//! -//! \brief std::streambuf implementation for system file handles. -//! -//! systembuf provides a std::streambuf implementation for system file -//! handles. Contrarywise to file_handle, this class does \b not take -//! ownership of the native file handle; this should be taken care of -//! somewhere else. -//! -//! This class follows the expected semantics of a std::streambuf object. -//! However, it is not copyable to avoid introducing inconsistences with -//! the on-disk file and the in-memory buffers. -//! -class systembuf : public std::streambuf -{ - // Non-copyable. - systembuf(const systembuf&); - systembuf& operator=(const systembuf&); - -public: - typedef int handle_type; - - //! - //! \brief Constructs a new systembuf for the given file handle. - //! - //! This constructor creates a new systembuf object that reads or - //! writes data from/to the \a h native file handle. This handle - //! is \b not owned by the created systembuf object; the code - //! should take care of it externally. - //! - //! This class buffers input and output; the buffer size may be - //! tuned through the \a bufsize parameter, which defaults to 8192 - //! bytes. - //! - //! \see pistream. - //! - explicit systembuf(handle_type h, std::size_t bufsize = 8192); - ~systembuf(void); - -private: - //! - //! \brief Native file handle used by the systembuf object. - //! - handle_type m_handle; - - //! - //! \brief Internal buffer size used during read and write operations. - //! - std::size_t m_bufsize; - - //! - //! \brief Internal buffer used during read operations. - //! - char* m_read_buf; - - //! - //! \brief Internal buffer used during write operations. - //! - char* m_write_buf; - -protected: - //! - //! \brief Reads new data from the native file handle. - //! - //! This operation is called by input methods when there are no more - //! data in the input buffer. The function fills the buffer with new - //! data, if available. - //! - //! \pre All input positions are exhausted (gptr() >= egptr()). - //! \post The input buffer has new data, if available. - //! \returns traits_type::eof() if a read error occurrs or there are - //! no more data to be read. Otherwise returns - //! traits_type::to_int_type(*gptr()). - //! - virtual int_type underflow(void); - - //! - //! \brief Makes room in the write buffer for additional data. - //! - //! This operation is called by output methods when there is no more - //! space in the output buffer to hold a new element. The function - //! first flushes the buffer's contents to disk and then clears it to - //! leave room for more characters. The given \a c character is - //! stored at the beginning of the new space. - //! - //! \pre All output positions are exhausted (pptr() >= epptr()). - //! \post The output buffer has more space if no errors occurred - //! during the write to disk. - //! \post *(pptr() - 1) is \a c. - //! \returns traits_type::eof() if a write error occurrs. Otherwise - //! returns traits_type::not_eof(c). - //! - virtual int_type overflow(int c); - - //! - //! \brief Flushes the output buffer to disk. - //! - //! Synchronizes the systembuf buffers with the contents of the file - //! associated to this object through the native file handle. The - //! output buffer is flushed to disk and cleared to leave new room - //! for more data. - //! - //! \returns 0 on success, -1 if an error occurred. - //! - virtual int sync(void); -}; - -// ------------------------------------------------------------------------ -// The "pistream" class. -// ------------------------------------------------------------------------ - -//! -//! \brief Child process' output stream. -//! -//! The pistream class represents an output communication channel with the -//! child process. The child process writes data to this stream and the -//! parent process can read it through the pistream object. In other -//! words, from the child's point of view, the communication channel is an -//! output one, but from the parent's point of view it is an input one; -//! hence the confusing pistream name. -//! -//! pistream objects cannot be copied because they own the file handle -//! they use to communicate with the child and because they buffer data -//! that flows through the communication channel. -//! -//! A pistream object behaves as a std::istream stream in all senses. -//! The class is only provided because it must provide a method to let -//! the caller explicitly close the communication channel. -//! -//! \remark Blocking remarks: Functions that read data from this -//! stream can block if the associated file handle blocks during the read. -//! As this class is used to communicate with child processes through -//! anonymous pipes, the most typical blocking condition happens when the -//! child has no more data to send to the pipe's system buffer. When -//! this happens, the buffer eventually empties and the system blocks -//! until the writer generates some data. -//! -class pistream : public std::istream -{ - // Non-copyable. - pistream(const pistream&); - pistream& operator=(const pistream&); - - //! - //! \brief The systembuf object used to manage this stream's data. - //! - systembuf m_systembuf; - -public: - //! - //! \brief Creates a new process' output stream. - //! - //! Given a file handle, this constructor creates a new pistream - //! object that owns the given file handle \a fh. Ownership of - //! \a fh is transferred to the created pistream object. - //! - //! \pre \a fh is valid. - //! \post \a fh is invalid. - //! \post The new pistream object owns \a fh. - //! - explicit pistream(const int); -}; - -// ------------------------------------------------------------------------ -// The "muxer" class. -// ------------------------------------------------------------------------ - -class muxer { - // Non-copyable. - muxer(const muxer&); - muxer& operator=(const muxer&); - - const int* m_fds; - const size_t m_nfds; - - const size_t m_bufsize; - tools::auto_array< std::string > m_buffers; - -protected: - virtual void line_callback(const size_t, const std::string&) = 0; - - size_t read_one(const size_t, const int, std::string&, const bool); - -public: - muxer(const int*, const size_t, const size_t bufsize = 1024); - virtual ~muxer(void); - - void mux(volatile const bool&); - void flush(void); -}; - -} // namespace io -} // namespace tools - -#endif // !defined(TOOLS_IO_HPP) diff --git a/tools/io_test.cpp b/tools/io_test.cpp deleted file mode 100644 index b55428f2829a..000000000000 --- a/tools/io_test.cpp +++ /dev/null @@ -1,471 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include - -#include -#include -} - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "io.hpp" -#include "signals.hpp" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -static -void -systembuf_check_data(std::istream& is, std::size_t length) -{ - char ch = 'A', chr; - std::size_t cnt = 0; - while (is >> chr) { - ATF_REQUIRE_EQ(ch, chr); - if (ch == 'Z') - ch = 'A'; - else - ch++; - cnt++; - } - ATF_REQUIRE_EQ(cnt, length); -} - -static -void -systembuf_write_data(std::ostream& os, std::size_t length) -{ - char ch = 'A'; - for (std::size_t i = 0; i < length; i++) { - os << ch; - if (ch == 'Z') - ch = 'A'; - else - ch++; - } - os.flush(); -} - -static -void -systembuf_test_read(std::size_t length, std::size_t bufsize) -{ - using tools::io::systembuf; - - std::ofstream f("test_read.txt"); - systembuf_write_data(f, length); - f.close(); - - int fd = ::open("test_read.txt", O_RDONLY); - ATF_REQUIRE(fd != -1); - systembuf sb(fd, bufsize); - std::istream is(&sb); - systembuf_check_data(is, length); - ::close(fd); - ::unlink("test_read.txt"); -} - -static -void -systembuf_test_write(std::size_t length, std::size_t bufsize) -{ - using tools::io::systembuf; - - int fd = ::open("test_write.txt", O_WRONLY | O_CREAT | O_TRUNC, - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - ATF_REQUIRE(fd != -1); - systembuf sb(fd, bufsize); - std::ostream os(&sb); - systembuf_write_data(os, length); - ::close(fd); - - std::ifstream is("test_write.txt"); - systembuf_check_data(is, length); - is.close(); - ::unlink("test_write.txt"); -} - -// ------------------------------------------------------------------------ -// Test cases for the "file_handle" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(file_handle_ctor); -ATF_TEST_CASE_HEAD(file_handle_ctor) -{ - set_md_var("descr", "Tests file_handle's constructors"); -} -ATF_TEST_CASE_BODY(file_handle_ctor) -{ - using tools::io::file_handle; - - file_handle fh1; - ATF_REQUIRE(!fh1.is_valid()); - - file_handle fh2(STDOUT_FILENO); - ATF_REQUIRE(fh2.is_valid()); - fh2.disown(); -} - -ATF_TEST_CASE(file_handle_copy); -ATF_TEST_CASE_HEAD(file_handle_copy) -{ - set_md_var("descr", "Tests file_handle's copy constructor"); -} -ATF_TEST_CASE_BODY(file_handle_copy) -{ - using tools::io::file_handle; - - file_handle fh1; - file_handle fh2(STDOUT_FILENO); - - file_handle fh3(fh2); - ATF_REQUIRE(!fh2.is_valid()); - ATF_REQUIRE(fh3.is_valid()); - - fh1 = fh3; - ATF_REQUIRE(!fh3.is_valid()); - ATF_REQUIRE(fh1.is_valid()); - - fh1.disown(); -} - -ATF_TEST_CASE(file_handle_get); -ATF_TEST_CASE_HEAD(file_handle_get) -{ - set_md_var("descr", "Tests the file_handle::get method"); -} -ATF_TEST_CASE_BODY(file_handle_get) -{ - using tools::io::file_handle; - - file_handle fh1(STDOUT_FILENO); - ATF_REQUIRE_EQ(fh1.get(), STDOUT_FILENO); -} - -ATF_TEST_CASE(file_handle_posix_remap); -ATF_TEST_CASE_HEAD(file_handle_posix_remap) -{ - set_md_var("descr", "Tests the file_handle::posix_remap method"); -} -ATF_TEST_CASE_BODY(file_handle_posix_remap) -{ - using tools::io::file_handle; - - int pfd[2]; - - ATF_REQUIRE(::pipe(pfd) != -1); - file_handle rend(pfd[0]); - file_handle wend(pfd[1]); - - ATF_REQUIRE(rend.get() != 10); - ATF_REQUIRE(wend.get() != 10); - wend.posix_remap(10); - ATF_REQUIRE_EQ(wend.get(), 10); - ATF_REQUIRE(::write(wend.get(), "test-posix-remap", 16) != -1); - { - char buf[17]; - ATF_REQUIRE_EQ(::read(rend.get(), buf, sizeof(buf)), 16); - buf[16] = '\0'; - ATF_REQUIRE(std::strcmp(buf, "test-posix-remap") == 0); - } - - // Redo previous to ensure that remapping over the same descriptor - // has no side-effects. - ATF_REQUIRE_EQ(wend.get(), 10); - wend.posix_remap(10); - ATF_REQUIRE_EQ(wend.get(), 10); - ATF_REQUIRE(::write(wend.get(), "test-posix-remap", 16) != -1); - { - char buf[17]; - ATF_REQUIRE_EQ(::read(rend.get(), buf, sizeof(buf)), 16); - buf[16] = '\0'; - ATF_REQUIRE(std::strcmp(buf, "test-posix-remap") == 0); - } -} - -// ------------------------------------------------------------------------ -// Test cases for the "systembuf" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(systembuf_short_read); -ATF_TEST_CASE_HEAD(systembuf_short_read) -{ - set_md_var("descr", "Tests that a short read (one that fits in the " - "internal buffer) works when using systembuf"); -} -ATF_TEST_CASE_BODY(systembuf_short_read) -{ - systembuf_test_read(64, 1024); -} - -ATF_TEST_CASE(systembuf_long_read); -ATF_TEST_CASE_HEAD(systembuf_long_read) -{ - set_md_var("descr", "Tests that a long read (one that does not fit in " - "the internal buffer) works when using systembuf"); -} -ATF_TEST_CASE_BODY(systembuf_long_read) -{ - systembuf_test_read(64 * 1024, 1024); -} - -ATF_TEST_CASE(systembuf_short_write); -ATF_TEST_CASE_HEAD(systembuf_short_write) -{ - set_md_var("descr", "Tests that a short write (one that fits in the " - "internal buffer) works when using systembuf"); -} -ATF_TEST_CASE_BODY(systembuf_short_write) -{ - systembuf_test_write(64, 1024); -} - -ATF_TEST_CASE(systembuf_long_write); -ATF_TEST_CASE_HEAD(systembuf_long_write) -{ - set_md_var("descr", "Tests that a long write (one that does not fit " - "in the internal buffer) works when using systembuf"); -} -ATF_TEST_CASE_BODY(systembuf_long_write) -{ - systembuf_test_write(64 * 1024, 1024); -} - -// ------------------------------------------------------------------------ -// Test cases for the "pistream" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(pistream); -ATF_TEST_CASE_HEAD(pistream) -{ - set_md_var("descr", "Tests the pistream class"); -} -ATF_TEST_CASE_BODY(pistream) -{ - using tools::io::file_handle; - using tools::io::pistream; - using tools::io::systembuf; - - int fds[2]; - ATF_REQUIRE(::pipe(fds) != -1); - - pistream rend(fds[0]); - - systembuf wbuf(fds[1]); - std::ostream wend(&wbuf); - - // XXX This assumes that the pipe's buffer is big enough to accept - // the data written without blocking! - wend << "1Test 1message\n"; - wend.flush(); - std::string tmp; - rend >> tmp; - ATF_REQUIRE_EQ(tmp, "1Test"); - rend >> tmp; - ATF_REQUIRE_EQ(tmp, "1message"); -} - -// ------------------------------------------------------------------------ -// Tests for the "muxer" class. -// ------------------------------------------------------------------------ - -namespace { - -static void -check_stream(std::ostream& os) -{ - // If we receive a signal while writing to the stream, the bad bit gets set. - // Things seem to behave fine afterwards if we clear such error condition. - // However, I'm not sure if it's safe to query errno at this point. - ATF_REQUIRE(os.good() || (os.bad() && errno == EINTR)); - os.clear(); -} - -class mock_muxer : public tools::io::muxer { - void line_callback(const size_t index, const std::string& line) - { - // The following should be enabled but causes the output to be so big - // that it is annoying. Reenable at some point if we make atf store - // the output of the test cases in some other way (e.g. only if a test - // failes), because this message is the only help in seeing how the - // test fails. - //std::cout << "line_callback(" << index << ", " << line << ")\n"; - check_stream(std::cout); - switch (index) { - case 0: lines0.push_back(line); break; - case 1: lines1.push_back(line); break; - default: ATF_REQUIRE(false); - } - } - -public: - mock_muxer(const int* fds, const size_t nfds, const size_t bufsize) : - muxer(fds, nfds, bufsize) {} - - std::vector< std::string > lines0; - std::vector< std::string > lines1; -}; - -static bool child_finished = false; -static void sigchld_handler(int signo) -{ - assert(signo == SIGCHLD); - child_finished = true; -} - -static void -child_printer(const int pipeout[2], const int pipeerr[2], - const size_t iterations) -{ - ::close(pipeout[0]); - ::close(pipeerr[0]); - ATF_REQUIRE(::dup2(pipeout[1], STDOUT_FILENO) != -1); - ATF_REQUIRE(::dup2(pipeerr[1], STDERR_FILENO) != -1); - ::close(pipeout[1]); - ::close(pipeerr[1]); - - for (size_t i = 0; i < iterations; i++) { - std::cout << "stdout " << i << "\n"; - std::cerr << "stderr " << i << "\n"; - } - - std::cout << "stdout eof\n"; - std::cerr << "stderr eof\n"; - std::exit(EXIT_SUCCESS); -} - -static void -muxer_test(const size_t bufsize, const size_t iterations) -{ - int pipeout[2], pipeerr[2]; - ATF_REQUIRE(pipe(pipeout) != -1); - ATF_REQUIRE(pipe(pipeerr) != -1); - - tools::signals::signal_programmer sigchld(SIGCHLD, sigchld_handler); - - std::cout.flush(); - std::cerr.flush(); - - pid_t pid = ::fork(); - ATF_REQUIRE(pid != -1); - if (pid == 0) { - sigchld.unprogram(); - child_printer(pipeout, pipeerr, iterations); - std::abort(); - } - ::close(pipeout[1]); - ::close(pipeerr[1]); - - int fds[2] = {pipeout[0], pipeerr[0]}; - mock_muxer mux(fds, 2, bufsize); - - mux.mux(child_finished); - check_stream(std::cout); - std::cout << "mux done\n"; - - mux.flush(); - std::cout << "flush done\n"; - check_stream(std::cout); - - sigchld.unprogram(); - int status; - ATF_REQUIRE(::waitpid(pid, &status, 0) != -1); - ATF_REQUIRE(WIFEXITED(status)); - ATF_REQUIRE(WEXITSTATUS(status) == EXIT_SUCCESS); - - ATF_REQUIRE(std::cout.good()); - ATF_REQUIRE(std::cerr.good()); - for (size_t i = 0; i < iterations; i++) { - std::ostringstream exp0, exp1; - exp0 << "stdout " << i; - exp1 << "stderr " << i; - - ATF_REQUIRE(mux.lines0.size() > i); - ATF_REQUIRE_EQ(exp0.str(), mux.lines0[i]); - ATF_REQUIRE(mux.lines1.size() > i); - ATF_REQUIRE_EQ(exp1.str(), mux.lines1[i]); - } - ATF_REQUIRE_EQ("stdout eof", mux.lines0[iterations]); - ATF_REQUIRE_EQ("stderr eof", mux.lines1[iterations]); - std::cout << "all done\n"; -} - -} // anonymous namespace - -ATF_TEST_CASE_WITHOUT_HEAD(muxer_small_buffer); -ATF_TEST_CASE_BODY(muxer_small_buffer) -{ - muxer_test(4, 20000); -} - -ATF_TEST_CASE_WITHOUT_HEAD(muxer_large_buffer); -ATF_TEST_CASE_BODY(muxer_large_buffer) -{ - muxer_test(1024, 50000); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the tests for the "file_handle" class. - ATF_ADD_TEST_CASE(tcs, file_handle_ctor); - ATF_ADD_TEST_CASE(tcs, file_handle_copy); - ATF_ADD_TEST_CASE(tcs, file_handle_get); - ATF_ADD_TEST_CASE(tcs, file_handle_posix_remap); - - // Add the tests for the "systembuf" class. - ATF_ADD_TEST_CASE(tcs, systembuf_short_read); - ATF_ADD_TEST_CASE(tcs, systembuf_long_read); - ATF_ADD_TEST_CASE(tcs, systembuf_short_write); - ATF_ADD_TEST_CASE(tcs, systembuf_long_write); - - // Add the tests for the "pistream" class. - ATF_ADD_TEST_CASE(tcs, pistream); - - // Add the tests for the "muxer" class. - ATF_ADD_TEST_CASE(tcs, muxer_small_buffer); - ATF_ADD_TEST_CASE(tcs, muxer_large_buffer); -} diff --git a/tools/misc_helpers.cpp b/tools/misc_helpers.cpp deleted file mode 100644 index 8ec4ddefcd88..000000000000 --- a/tools/misc_helpers.cpp +++ /dev/null @@ -1,448 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include - -#include -#include -} - -#include -#include -#include -#include -#include -#include - -#include - -#include "env.hpp" -#include "fs.hpp" -#include "process.hpp" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -static -void -touch(const std::string& path) -{ - std::ofstream os(path.c_str()); - if (!os) - ATF_FAIL("Could not create file " + path); - os.close(); -} - -// ------------------------------------------------------------------------ -// Helper tests for "atf-run_test". -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(pass); -ATF_TEST_CASE_HEAD(pass) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(pass) -{ -} - -ATF_TEST_CASE(config); -ATF_TEST_CASE_HEAD(config) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(config) -{ - std::cout << "1st: " << get_config_var("1st") << "\n"; - std::cout << "2nd: " << get_config_var("2nd") << "\n"; - std::cout << "3rd: " << get_config_var("3rd") << "\n"; - std::cout << "4th: " << get_config_var("4th") << "\n"; -} - -ATF_TEST_CASE(fds); -ATF_TEST_CASE_HEAD(fds) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(fds) -{ - std::cout << "msg1 to stdout" << "\n"; - std::cout << "msg2 to stdout" << "\n"; - std::cerr << "msg1 to stderr" << "\n"; - std::cerr << "msg2 to stderr" << "\n"; -} - -ATF_TEST_CASE_WITHOUT_HEAD(mux_streams); -ATF_TEST_CASE_BODY(mux_streams) -{ - for (size_t i = 0; i < 10000; i++) { - switch (i % 5) { - case 0: - std::cout << "stdout " << i << "\n"; - break; - case 1: - std::cerr << "stderr " << i << "\n"; - break; - case 2: - std::cout << "stdout " << i << "\n"; - std::cerr << "stderr " << i << "\n"; - break; - case 3: - std::cout << "stdout " << i << "\n"; - std::cout << "stdout " << i << "\n"; - std::cerr << "stderr " << i << "\n"; - break; - case 4: - std::cout << "stdout " << i << "\n"; - std::cerr << "stderr " << i << "\n"; - std::cerr << "stderr " << i << "\n"; - break; - default: - std::abort(); - } - } -} - -ATF_TEST_CASE(testvar); -ATF_TEST_CASE_HEAD(testvar) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(testvar) -{ - if (!has_config_var("testvar")) - fail("testvar variable not defined"); - std::cout << "testvar: " << get_config_var("testvar") << "\n"; -} - -ATF_TEST_CASE(env_list); -ATF_TEST_CASE_HEAD(env_list) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(env_list) -{ - const tools::process::status s = - tools::process::exec(tools::fs::path("env"), - tools::process::argv_array("env", NULL), - tools::process::stream_inherit(), - tools::process::stream_inherit()); - ATF_REQUIRE(s.exited()); - ATF_REQUIRE(s.exitstatus() == EXIT_SUCCESS); -} - -ATF_TEST_CASE(env_home); -ATF_TEST_CASE_HEAD(env_home) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(env_home) -{ - ATF_REQUIRE(tools::env::has("HOME")); - tools::fs::path p(tools::env::get("HOME")); - tools::fs::file_info fi1(p); - tools::fs::file_info fi2(tools::fs::path(".")); - ATF_REQUIRE_EQ(fi1.get_device(), fi2.get_device()); - ATF_REQUIRE_EQ(fi1.get_inode(), fi2.get_inode()); -} - -ATF_TEST_CASE(read_stdin); -ATF_TEST_CASE_HEAD(read_stdin) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(read_stdin) -{ - char buf[100]; - ssize_t len = ::read(STDIN_FILENO, buf, sizeof(buf) - 1); - ATF_REQUIRE(len != -1); - - buf[len + 1] = '\0'; - for (ssize_t i = 0; i < len; i++) { - if (buf[i] != '\0') { - fail("The stdin of the test case does not seem to be /dev/zero; " - "got '" + std::string(buf) + "'"); - } - } -} - -ATF_TEST_CASE(umask); -ATF_TEST_CASE_HEAD(umask) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(umask) -{ - mode_t m = ::umask(0); - std::cout << "umask: " << std::setw(4) << std::setfill('0') - << std::oct << m << "\n"; - (void)::umask(m); -} - -ATF_TEST_CASE_WITH_CLEANUP(cleanup_states); -ATF_TEST_CASE_HEAD(cleanup_states) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(cleanup_states) -{ - touch(get_config_var("statedir") + "/to-delete"); - touch(get_config_var("statedir") + "/to-stay"); - - if (get_config_var("state") == "fail") - ATF_FAIL("On purpose"); - else if (get_config_var("state") == "skip") - ATF_SKIP("On purpose"); -} -ATF_TEST_CASE_CLEANUP(cleanup_states) -{ - tools::fs::remove(tools::fs::path(get_config_var("statedir") + "/to-delete")); -} - -ATF_TEST_CASE_WITH_CLEANUP(cleanup_curdir); -ATF_TEST_CASE_HEAD(cleanup_curdir) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(cleanup_curdir) -{ - std::ofstream os("oldvalue"); - if (!os) - ATF_FAIL("Failed to create oldvalue file"); - os << 1234; - os.close(); -} -ATF_TEST_CASE_CLEANUP(cleanup_curdir) -{ - std::ifstream is("oldvalue"); - if (is) { - int i; - is >> i; - std::cout << "Old value: " << i << "\n"; - is.close(); - } -} - -ATF_TEST_CASE(require_arch); -ATF_TEST_CASE_HEAD(require_arch) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); - set_md_var("require.arch", get_config_var("arch", "not-set")); -} -ATF_TEST_CASE_BODY(require_arch) -{ -} - -ATF_TEST_CASE(require_config); -ATF_TEST_CASE_HEAD(require_config) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); - set_md_var("require.config", "var1 var2"); -} -ATF_TEST_CASE_BODY(require_config) -{ - std::cout << "var1: " << get_config_var("var1") << "\n"; - std::cout << "var2: " << get_config_var("var2") << "\n"; -} - -ATF_TEST_CASE(require_files); -ATF_TEST_CASE_HEAD(require_files) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); - set_md_var("require.files", get_config_var("files", "not-set")); -} -ATF_TEST_CASE_BODY(require_files) -{ -} - -ATF_TEST_CASE(require_machine); -ATF_TEST_CASE_HEAD(require_machine) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); - set_md_var("require.machine", get_config_var("machine", "not-set")); -} -ATF_TEST_CASE_BODY(require_machine) -{ -} - -ATF_TEST_CASE(require_progs); -ATF_TEST_CASE_HEAD(require_progs) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); - set_md_var("require.progs", get_config_var("progs", "not-set")); -} -ATF_TEST_CASE_BODY(require_progs) -{ -} - -ATF_TEST_CASE(require_user); -ATF_TEST_CASE_HEAD(require_user) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); - set_md_var("require.user", get_config_var("user", "not-set")); -} -ATF_TEST_CASE_BODY(require_user) -{ -} - -ATF_TEST_CASE(timeout); -ATF_TEST_CASE_HEAD(timeout) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); - set_md_var("timeout", "1"); -} -ATF_TEST_CASE_BODY(timeout) -{ - sleep(10); - touch(get_config_var("statedir") + "/finished"); -} - -ATF_TEST_CASE(timeout_forkexit); -ATF_TEST_CASE_HEAD(timeout_forkexit) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); -} -ATF_TEST_CASE_BODY(timeout_forkexit) -{ - pid_t pid = fork(); - ATF_REQUIRE(pid != -1); - - if (pid == 0) { - sigset_t mask; - sigemptyset(&mask); - - std::cout << "Waiting in subprocess\n"; - std::cout.flush(); - ::sigsuspend(&mask); - - touch(get_config_var("statedir") + "/child-finished"); - std::cout << "Subprocess exiting\n"; - std::cout.flush(); - exit(EXIT_SUCCESS); - } else { - // Don't wait for the child process and let atf-run deal with it. - touch(get_config_var("statedir") + "/parent-finished"); - std::cout << "Parent process exiting\n"; - ATF_PASS(); - } -} - -ATF_TEST_CASE(use_fs); -ATF_TEST_CASE_HEAD(use_fs) -{ - set_md_var("descr", "Helper test case for the t_integration test program"); - set_md_var("use.fs", "this-is-deprecated"); -} -ATF_TEST_CASE_BODY(use_fs) -{ - touch("test-file"); -} - -// ------------------------------------------------------------------------ -// Helper tests for "atf-report_test". -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(diff); -ATF_TEST_CASE_HEAD(diff) -{ - set_md_var("descr", "Helper test case for the t_integration program"); -} -ATF_TEST_CASE_BODY(diff) -{ - std::cout << "--- a 2007-11-04 14:00:41.000000000 +0100\n"; - std::cout << "+++ b 2007-11-04 14:00:48.000000000 +0100\n"; - std::cout << "@@ -1,7 +1,7 @@\n"; - std::cout << " This test is meant to simulate a diff.\n"; - std::cout << " Blank space at beginning of context lines must be " - "preserved.\n"; - std::cout << " \n"; - std::cout << "-First original line.\n"; - std::cout << "-Second original line.\n"; - std::cout << "+First modified line.\n"; - std::cout << "+Second modified line.\n"; - std::cout << " \n"; - std::cout << " EOF\n"; -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - std::string which = tools::env::get("TESTCASE"); - - // Add helper tests for atf-run_test. - if (which == "pass") - ATF_ADD_TEST_CASE(tcs, pass); - if (which == "config") - ATF_ADD_TEST_CASE(tcs, config); - if (which == "fds") - ATF_ADD_TEST_CASE(tcs, fds); - if (which == "mux_streams") - ATF_ADD_TEST_CASE(tcs, mux_streams); - if (which == "testvar") - ATF_ADD_TEST_CASE(tcs, testvar); - if (which == "env_list") - ATF_ADD_TEST_CASE(tcs, env_list); - if (which == "env_home") - ATF_ADD_TEST_CASE(tcs, env_home); - if (which == "read_stdin") - ATF_ADD_TEST_CASE(tcs, read_stdin); - if (which == "umask") - ATF_ADD_TEST_CASE(tcs, umask); - if (which == "cleanup_states") - ATF_ADD_TEST_CASE(tcs, cleanup_states); - if (which == "cleanup_curdir") - ATF_ADD_TEST_CASE(tcs, cleanup_curdir); - if (which == "require_arch") - ATF_ADD_TEST_CASE(tcs, require_arch); - if (which == "require_config") - ATF_ADD_TEST_CASE(tcs, require_config); - if (which == "require_files") - ATF_ADD_TEST_CASE(tcs, require_files); - if (which == "require_machine") - ATF_ADD_TEST_CASE(tcs, require_machine); - if (which == "require_progs") - ATF_ADD_TEST_CASE(tcs, require_progs); - if (which == "require_user") - ATF_ADD_TEST_CASE(tcs, require_user); - if (which == "timeout") - ATF_ADD_TEST_CASE(tcs, timeout); - if (which == "timeout_forkexit") - ATF_ADD_TEST_CASE(tcs, timeout_forkexit); - if (which == "use_fs") - ATF_ADD_TEST_CASE(tcs, use_fs); - - // Add helper tests for atf-report_test. - if (which == "diff") - ATF_ADD_TEST_CASE(tcs, diff); -} diff --git a/tools/parser.cpp b/tools/parser.cpp deleted file mode 100644 index e6b3a3b750ef..000000000000 --- a/tools/parser.cpp +++ /dev/null @@ -1,384 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include - -#include "parser.hpp" -#include "text.hpp" - -namespace impl = tools::parser; -#define IMPL_NAME "tools::parser" - -// ------------------------------------------------------------------------ -// The "parse_error" class. -// ------------------------------------------------------------------------ - -impl::parse_error::parse_error(size_t line, std::string msg) : - std::runtime_error(msg), - std::pair< size_t, std::string >(line, msg) -{ -} - -impl::parse_error::~parse_error(void) - throw() -{ -} - -const char* -impl::parse_error::what(void) - const throw() -{ - try { - std::ostringstream oss; - oss << "LONELY PARSE ERROR: " << first << ": " << second; - m_msg = oss.str(); - return m_msg.c_str(); - } catch (...) { - return "Could not format message for parsing error."; - } -} - -impl::parse_error::operator std::string(void) - const -{ - return tools::text::to_string(first) + ": " + second; -} - -// ------------------------------------------------------------------------ -// The "parse_errors" class. -// ------------------------------------------------------------------------ - -impl::parse_errors::parse_errors(void) : - std::runtime_error("No parsing errors yet") -{ - m_msg.clear(); -} - -impl::parse_errors::~parse_errors(void) - throw() -{ -} - -const char* -impl::parse_errors::what(void) - const throw() -{ - try { - m_msg = tools::text::join(*this, "\n"); - return m_msg.c_str(); - } catch (...) { - return "Could not format messages for parsing errors."; - } -} - -// ------------------------------------------------------------------------ -// The "format_error" class. -// ------------------------------------------------------------------------ - -impl::format_error::format_error(const std::string& w) : - std::runtime_error(w.c_str()) -{ -} - -// ------------------------------------------------------------------------ -// The "token" class. -// ------------------------------------------------------------------------ - -impl::token::token(void) : - m_inited(false) -{ -} - -impl::token::token(size_t p_line, - const token_type& p_type, - const std::string& p_text) : - m_inited(true), - m_line(p_line), - m_type(p_type), - m_text(p_text) -{ -} - -size_t -impl::token::lineno(void) - const -{ - return m_line; -} - -const impl::token_type& -impl::token::type(void) - const -{ - return m_type; -} - -const std::string& -impl::token::text(void) - const -{ - return m_text; -} - -impl::token::operator bool(void) - const -{ - return m_inited; -} - -bool -impl::token::operator!(void) - const -{ - return !m_inited; -} - -// ------------------------------------------------------------------------ -// The "header_entry" class. -// ------------------------------------------------------------------------ - -impl::header_entry::header_entry(void) -{ -} - -impl::header_entry::header_entry(const std::string& n, const std::string& v, - attrs_map as) : - m_name(n), - m_value(v), - m_attrs(as) -{ -} - -const std::string& -impl::header_entry::name(void) const -{ - return m_name; -} - -const std::string& -impl::header_entry::value(void) const -{ - return m_value; -} - -const impl::attrs_map& -impl::header_entry::attrs(void) const -{ - return m_attrs; -} - -bool -impl::header_entry::has_attr(const std::string& n) const -{ - return m_attrs.find(n) != m_attrs.end(); -} - -const std::string& -impl::header_entry::get_attr(const std::string& n) const -{ - attrs_map::const_iterator iter = m_attrs.find(n); - assert(iter != m_attrs.end()); - return (*iter).second; -} - -// ------------------------------------------------------------------------ -// The header tokenizer. -// ------------------------------------------------------------------------ - -namespace header { - -static const impl::token_type eof_type = 0; -static const impl::token_type nl_type = 1; -static const impl::token_type text_type = 2; -static const impl::token_type colon_type = 3; -static const impl::token_type semicolon_type = 4; -static const impl::token_type dblquote_type = 5; -static const impl::token_type equal_type = 6; - -class tokenizer : public impl::tokenizer< std::istream > { -public: - tokenizer(std::istream& is, size_t curline) : - impl::tokenizer< std::istream > - (is, true, eof_type, nl_type, text_type, curline) - { - add_delim(';', semicolon_type); - add_delim(':', colon_type); - add_delim('=', equal_type); - add_quote('"', dblquote_type); - } -}; - -static -impl::parser< header::tokenizer >& -read(impl::parser< header::tokenizer >& p, impl::header_entry& he) -{ - using namespace header; - - impl::token t = p.expect(text_type, nl_type, "a header name"); - if (t.type() == nl_type) { - he = impl::header_entry(); - return p; - } - std::string hdr_name = t.text(); - - t = p.expect(colon_type, "`:'"); - - t = p.expect(text_type, "a textual value"); - std::string hdr_value = t.text(); - - impl::attrs_map attrs; - - for (;;) { - t = p.expect(eof_type, semicolon_type, nl_type, - "eof, `;' or new line"); - if (t.type() == eof_type || t.type() == nl_type) - break; - - t = p.expect(text_type, "an attribute name"); - std::string attr_name = t.text(); - - t = p.expect(equal_type, "`='"); - - t = p.expect(text_type, "word or quoted string"); - std::string attr_value = t.text(); - attrs[attr_name] = attr_value; - } - - he = impl::header_entry(hdr_name, hdr_value, attrs); - - return p; -} - -static -std::ostream& -write(std::ostream& os, const impl::header_entry& he) -{ - std::string line = he.name() + ": " + he.value(); - impl::attrs_map as = he.attrs(); - for (impl::attrs_map::const_iterator iter = as.begin(); iter != as.end(); - iter++) { - assert((*iter).second.find('\"') == std::string::npos); - line += "; " + (*iter).first + "=\"" + (*iter).second + "\""; - } - - os << line << "\n"; - - return os; -} - -} // namespace header - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -std::pair< size_t, impl::headers_map > -impl::read_headers(std::istream& is, size_t curline) -{ - using impl::format_error; - - headers_map hm; - - // - // Grammar - // - // header = entry+ nl - // entry = line nl - // line = text colon text - // (semicolon (text equal (text | dblquote string dblquote)))* - // string = quoted_string - // - - header::tokenizer tkz(is, curline); - impl::parser< header::tokenizer > p(tkz); - - bool first = true; - for (;;) { - try { - header_entry he; - if (!header::read(p, he).good() || he.name().empty()) - break; - - if (first && he.name() != "Content-Type") - throw format_error("Could not determine content type"); - else - first = false; - - hm[he.name()] = he; - } catch (const impl::parse_error& pe) { - p.add_error(pe); - p.reset(header::nl_type); - } - } - - if (!is.good()) - throw format_error("Unexpected end of stream"); - - return std::pair< size_t, headers_map >(tkz.lineno(), hm); -} - -void -impl::write_headers(const impl::headers_map& hm, std::ostream& os) -{ - assert(!hm.empty()); - headers_map::const_iterator ct = hm.find("Content-Type"); - assert(ct != hm.end()); - header::write(os, (*ct).second); - for (headers_map::const_iterator iter = hm.begin(); iter != hm.end(); - iter++) { - if ((*iter).first != "Content-Type") - header::write(os, (*iter).second); - } - os << "\n"; -} - -void -impl::validate_content_type(const impl::headers_map& hm, const std::string& fmt, - int version) -{ - using impl::format_error; - - headers_map::const_iterator iter = hm.find("Content-Type"); - if (iter == hm.end()) - throw format_error("Could not determine content type"); - - const header_entry& he = (*iter).second; - if (he.value() != fmt) - throw format_error("Mismatched content type: expected `" + fmt + - "' but got `" + he.value() + "'"); - - if (!he.has_attr("version")) - throw format_error("Could not determine version"); - const std::string& vstr = tools::text::to_string(version); - if (he.get_attr("version") != vstr) - throw format_error("Mismatched version: expected `" + - vstr + "' but got `" + - he.get_attr("version") + "'"); -} diff --git a/tools/parser.hpp b/tools/parser.hpp deleted file mode 100644 index eb00cb466dad..000000000000 --- a/tools/parser.hpp +++ /dev/null @@ -1,607 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_PARSER_HPP) -#define TOOLS_PARSER_HPP - -#include -#include -#include -#include -#include -#include -#include - -namespace tools { -namespace parser { - -// ------------------------------------------------------------------------ -// The "parse_error" class. -// ------------------------------------------------------------------------ - -class parse_error : public std::runtime_error, - public std::pair< size_t, std::string > { - mutable std::string m_msg; - -public: - parse_error(size_t, std::string); - ~parse_error(void) throw(); - - const char* what(void) const throw(); - - operator std::string(void) const; -}; - -// ------------------------------------------------------------------------ -// The "parse_errors" class. -// ------------------------------------------------------------------------ - -class parse_errors : public std::runtime_error, - public std::vector< parse_error > { - std::vector< parse_error > m_errors; - mutable std::string m_msg; - -public: - parse_errors(void); - ~parse_errors(void) throw(); - - const char* what(void) const throw(); -}; - -// ------------------------------------------------------------------------ -// The "format_error" class. -// ------------------------------------------------------------------------ - -class format_error : public std::runtime_error { -public: - format_error(const std::string&); -}; - -// ------------------------------------------------------------------------ -// The "token" class. -// ------------------------------------------------------------------------ - -typedef int token_type; - -//! -//! \brief Representation of a read token. -//! -//! A pair that contains the information of a token read from a stream. -//! It contains the token's type and its associated data, if any. -//! -struct token { - bool m_inited; - size_t m_line; - token_type m_type; - std::string m_text; - -public: - token(void); - token(size_t, const token_type&, const std::string& = ""); - - size_t lineno(void) const; - const token_type& type(void) const; - const std::string& text(void) const; - - operator bool(void) const; - bool operator!(void) const; -}; - -// ------------------------------------------------------------------------ -// The "tokenizer" class. -// ------------------------------------------------------------------------ - -//! -//! \brief A stream tokenizer. -//! -//! This template implements an extremely simple, line-oriented stream -//! tokenizer. It is only able to recognize one character-long delimiters, -//! random-length keywords, skip whitespace and, anything that does not -//! match these rules is supposed to be a word. -//! -//! Parameter IS: The input stream's type. -//! -template< class IS > -class tokenizer { - IS& m_is; - size_t m_lineno; - token m_la; - - bool m_skipws; - token_type m_eof_type, m_nl_type, m_text_type; - - std::map< char, token_type > m_delims_map; - std::string m_delims_str; - - char m_quotech; - token_type m_quotetype; - - std::map< std::string, token_type > m_keywords_map; - - token_type alloc_type(void); - - template< class TKZ > - friend - class parser; - -public: - tokenizer(IS&, bool, const token_type&, const token_type&, - const token_type&, size_t = 1); - - size_t lineno(void) const; - - void add_delim(char, const token_type&); - void add_keyword(const std::string&, const token_type&); - void add_quote(char, const token_type&); - - token next(void); - std::string rest_of_line(void); -}; - -template< class IS > -tokenizer< IS >::tokenizer(IS& p_is, - bool p_skipws, - const token_type& p_eof_type, - const token_type& p_nl_type, - const token_type& p_text_type, - size_t p_lineno) : - m_is(p_is), - m_lineno(p_lineno), - m_skipws(p_skipws), - m_eof_type(p_eof_type), - m_nl_type(p_nl_type), - m_text_type(p_text_type), - m_quotech(-1) -{ -} - -template< class IS > -size_t -tokenizer< IS >::lineno(void) - const -{ - return m_lineno; -} - -template< class IS > -void -tokenizer< IS >::add_delim(char delim, const token_type& type) -{ - m_delims_map[delim] = type; - m_delims_str += delim; -} - -template< class IS > -void -tokenizer< IS >::add_keyword(const std::string& keyword, - const token_type& type) -{ - m_keywords_map[keyword] = type; -} - -template< class IS > -void -tokenizer< IS >::add_quote(char ch, const token_type& type) -{ - m_quotech = ch; - m_quotetype = type; -} - -template< class IS > -token -tokenizer< IS >::next(void) -{ - if (m_la) { - token t = m_la; - m_la = token(); - if (t.type() == m_nl_type) - m_lineno++; - return t; - } - - char ch; - std::string text; - - bool done = false, quoted = false; - token t(m_lineno, m_eof_type, "<>"); - while (!done && m_is.get(ch).good()) { - if (ch == m_quotech) { - if (text.empty()) { - bool escaped = false; - while (!done && m_is.get(ch).good()) { - if (!escaped) { - if (ch == '\\') - escaped = true; - else if (ch == '\n') { - m_la = token(m_lineno, m_nl_type, "<>"); - throw parse_error(t.lineno(), - "Missing double quotes before " - "end of line"); - } else if (ch == m_quotech) - done = true; - else - text += ch; - } else { - text += ch; - escaped = false; - } - } - if (!m_is.good()) - throw parse_error(t.lineno(), - "Missing double quotes before " - "end of file"); - t = token(m_lineno, m_text_type, text); - quoted = true; - } else { - m_is.putback(ch); - done = true; - } - } else { - typename std::map< char, token_type >::const_iterator idelim; - idelim = m_delims_map.find(ch); - if (idelim != m_delims_map.end()) { - done = true; - if (text.empty()) - t = token(m_lineno, (*idelim).second, - std::string("") + ch); - else - m_is.putback(ch); - } else if (ch == '\n') { - done = true; - if (text.empty()) - t = token(m_lineno, m_nl_type, "<>"); - else - m_is.putback(ch); - } else if (m_skipws && (ch == ' ' || ch == '\t')) { - if (!text.empty()) - done = true; - } else - text += ch; - } - } - - if (!quoted && !text.empty()) { - typename std::map< std::string, token_type >::const_iterator ikw; - ikw = m_keywords_map.find(text); - if (ikw != m_keywords_map.end()) - t = token(m_lineno, (*ikw).second, text); - else - t = token(m_lineno, m_text_type, text); - } - - if (t.type() == m_nl_type) - m_lineno++; - - return t; -} - -template< class IS > -std::string -tokenizer< IS >::rest_of_line(void) -{ - std::string str; - while (m_is.good() && m_is.peek() != '\n') - str += m_is.get(); - return str; -} - -// ------------------------------------------------------------------------ -// The "parser" class. -// ------------------------------------------------------------------------ - -template< class TKZ > -class parser { - TKZ& m_tkz; - token m_last; - parse_errors m_errors; - bool m_thrown; - -public: - parser(TKZ& tkz); - ~parser(void); - - bool good(void) const; - void add_error(const parse_error&); - bool has_errors(void) const; - - token next(void); - std::string rest_of_line(void); - token reset(const token_type&); - - token - expect(const token_type&, - const std::string&); - - token - expect(const token_type&, - const token_type&, - const std::string&); - - token - expect(const token_type&, - const token_type&, - const token_type&, - const std::string&); - - token - expect(const token_type&, - const token_type&, - const token_type&, - const token_type&, - const std::string&); - - token - expect(const token_type&, - const token_type&, - const token_type&, - const token_type&, - const token_type&, - const token_type&, - const token_type&, - const std::string&); - - token - expect(const token_type&, - const token_type&, - const token_type&, - const token_type&, - const token_type&, - const token_type&, - const token_type&, - const token_type&, - const std::string&); -}; - -template< class TKZ > -parser< TKZ >::parser(TKZ& tkz) : - m_tkz(tkz), - m_thrown(false) -{ -} - -template< class TKZ > -parser< TKZ >::~parser(void) -{ - if (!m_errors.empty() && !m_thrown) - throw m_errors; -} - -template< class TKZ > -bool -parser< TKZ >::good(void) - const -{ - return m_tkz.m_is.good(); -} - -template< class TKZ > -void -parser< TKZ >::add_error(const parse_error& pe) -{ - m_errors.push_back(pe); -} - -template< class TKZ > -bool -parser< TKZ >::has_errors(void) - const -{ - return !m_errors.empty(); -} - -template< class TKZ > -token -parser< TKZ >::next(void) -{ - token t = m_tkz.next(); - - m_last = t; - - if (t.type() == m_tkz.m_eof_type) { - if (!m_errors.empty()) { - m_thrown = true; - throw m_errors; - } - } - - return t; -} - -template< class TKZ > -std::string -parser< TKZ >::rest_of_line(void) -{ - return m_tkz.rest_of_line(); -} - -template< class TKZ > -token -parser< TKZ >::reset(const token_type& stop) -{ - token t = m_last; - - while (t.type() != m_tkz.m_eof_type && t.type() != stop) - t = next(); - - return t; -} - -template< class TKZ > -token -parser< TKZ >::expect(const token_type& t1, - const std::string& textual) -{ - token t = next(); - - if (t.type() != t1) - throw parse_error(t.lineno(), - "Unexpected token `" + t.text() + - "'; expected " + textual); - - return t; -} - -template< class TKZ > -token -parser< TKZ >::expect(const token_type& t1, - const token_type& t2, - const std::string& textual) -{ - token t = next(); - - if (t.type() != t1 && t.type() != t2) - throw parse_error(t.lineno(), - "Unexpected token `" + t.text() + - "'; expected " + textual); - - return t; -} - -template< class TKZ > -token -parser< TKZ >::expect(const token_type& t1, - const token_type& t2, - const token_type& t3, - const std::string& textual) -{ - token t = next(); - - if (t.type() != t1 && t.type() != t2 && t.type() != t3) - throw parse_error(t.lineno(), - "Unexpected token `" + t.text() + - "'; expected " + textual); - - return t; -} - -template< class TKZ > -token -parser< TKZ >::expect(const token_type& t1, - const token_type& t2, - const token_type& t3, - const token_type& t4, - const std::string& textual) -{ - token t = next(); - - if (t.type() != t1 && t.type() != t2 && t.type() != t3 && - t.type() != t4) - throw parse_error(t.lineno(), - "Unexpected token `" + t.text() + - "'; expected " + textual); - - return t; -} - -template< class TKZ > -token -parser< TKZ >::expect(const token_type& t1, - const token_type& t2, - const token_type& t3, - const token_type& t4, - const token_type& t5, - const token_type& t6, - const token_type& t7, - const std::string& textual) -{ - token t = next(); - - if (t.type() != t1 && t.type() != t2 && t.type() != t3 && - t.type() != t4 && t.type() != t5 && t.type() != t6 && - t.type() != t7) - throw parse_error(t.lineno(), - "Unexpected token `" + t.text() + - "'; expected " + textual); - - return t; -} - -template< class TKZ > -token -parser< TKZ >::expect(const token_type& t1, - const token_type& t2, - const token_type& t3, - const token_type& t4, - const token_type& t5, - const token_type& t6, - const token_type& t7, - const token_type& t8, - const std::string& textual) -{ - token t = next(); - - if (t.type() != t1 && t.type() != t2 && t.type() != t3 && - t.type() != t4 && t.type() != t5 && t.type() != t6 && - t.type() != t7 && t.type() != t8) - throw parse_error(t.lineno(), - "Unexpected token `" + t.text() + - "'; expected " + textual); - - return t; -} - -#define ATF_PARSER_CALLBACK(parser, func) \ - do { \ - if (!(parser).has_errors()) \ - func; \ - } while (false) - -// ------------------------------------------------------------------------ -// Header parsing. -// ------------------------------------------------------------------------ - -typedef std::map< std::string, std::string > attrs_map; - -class header_entry { - std::string m_name; - std::string m_value; - attrs_map m_attrs; - -public: - header_entry(void); - header_entry(const std::string&, const std::string&, - attrs_map = attrs_map()); - - const std::string& name(void) const; - const std::string& value(void) const; - const attrs_map& attrs(void) const; - bool has_attr(const std::string&) const; - const std::string& get_attr(const std::string&) const; -}; - -typedef std::map< std::string, header_entry > headers_map; - -std::pair< size_t, headers_map > read_headers(std::istream&, size_t); -void write_headers(const headers_map&, std::ostream&); -void validate_content_type(const headers_map&, const std::string&, int); - -} // namespace parser -} // namespace tools - -#endif // !defined(TOOLS_PARSER_HPP) diff --git a/tools/parser_test.cpp b/tools/parser_test.cpp deleted file mode 100644 index 434a1a6780c4..000000000000 --- a/tools/parser_test.cpp +++ /dev/null @@ -1,1043 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include - -#include "parser.hpp" -#include "test_helpers.hpp" - -// ------------------------------------------------------------------------ -// Tests for the "parse_error" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(parse_error_to_string); -ATF_TEST_CASE_HEAD(parse_error_to_string) -{ - set_md_var("descr", "Tests the parse_error conversion to strings"); -} -ATF_TEST_CASE_BODY(parse_error_to_string) -{ - using tools::parser::parse_error; - - const parse_error e(123, "This is the message"); - ATF_REQUIRE_EQ("123: This is the message", std::string(e)); -} - -// ------------------------------------------------------------------------ -// Tests for the "parse_errors" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(parse_errors_what); -ATF_TEST_CASE_HEAD(parse_errors_what) -{ - set_md_var("descr", "Tests the parse_errors description"); -} -ATF_TEST_CASE_BODY(parse_errors_what) -{ - using tools::parser::parse_error; - using tools::parser::parse_errors; - - parse_errors es; - es.push_back(parse_error(2, "Second error")); - es.push_back(parse_error(1, "First error")); - - ATF_REQUIRE_EQ("2: Second error\n1: First error", std::string(es.what())); -} - -// ------------------------------------------------------------------------ -// Tests for the "token" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(token_getters); -ATF_TEST_CASE_HEAD(token_getters) -{ - set_md_var("descr", "Tests the token getters"); -} -ATF_TEST_CASE_BODY(token_getters) -{ - using tools::parser::token; - - { - token t(10, 0); - ATF_REQUIRE_EQ(t.lineno(), 10); - ATF_REQUIRE_EQ(t.type(), 0); - ATF_REQUIRE(t.text().empty()); - } - - { - token t(10, 0, "foo"); - ATF_REQUIRE_EQ(t.lineno(), 10); - ATF_REQUIRE_EQ(t.type(), 0); - ATF_REQUIRE_EQ(t.text(), "foo"); - } - - { - token t(20, 1); - ATF_REQUIRE_EQ(t.lineno(), 20); - ATF_REQUIRE_EQ(t.type(), 1); - ATF_REQUIRE(t.text().empty()); - } - - { - token t(20, 1, "bar"); - ATF_REQUIRE_EQ(t.lineno(), 20); - ATF_REQUIRE_EQ(t.type(), 1); - ATF_REQUIRE_EQ(t.text(), "bar"); - } -} - -// ------------------------------------------------------------------------ -// Tests for the "tokenizer" class. -// ------------------------------------------------------------------------ - -#define EXPECT(tkz, ttype, ttext) \ - do { \ - tools::parser::token t = tkz.next(); \ - ATF_REQUIRE(t.type() == ttype); \ - ATF_REQUIRE_EQ(t.text(), ttext); \ - } while (false); - -namespace minimal { - - static const tools::parser::token_type eof_type = 0; - static const tools::parser::token_type nl_type = 1; - static const tools::parser::token_type word_type = 2; - - class tokenizer : public tools::parser::tokenizer< std::istream > { - public: - tokenizer(std::istream& is, bool skipws) : - tools::parser::tokenizer< std::istream > - (is, skipws, eof_type, nl_type, word_type) - { - } - }; - -} - -namespace delims { - - static const tools::parser::token_type eof_type = 0; - static const tools::parser::token_type nl_type = 1; - static const tools::parser::token_type word_type = 2; - static const tools::parser::token_type plus_type = 3; - static const tools::parser::token_type minus_type = 4; - static const tools::parser::token_type equal_type = 5; - - class tokenizer : public tools::parser::tokenizer< std::istream > { - public: - tokenizer(std::istream& is, bool skipws) : - tools::parser::tokenizer< std::istream > - (is, skipws, eof_type, nl_type, word_type) - { - add_delim('+', plus_type); - add_delim('-', minus_type); - add_delim('=', equal_type); - } - }; - -} - -namespace keywords { - - static const tools::parser::token_type eof_type = 0; - static const tools::parser::token_type nl_type = 1; - static const tools::parser::token_type word_type = 2; - static const tools::parser::token_type var_type = 3; - static const tools::parser::token_type loop_type = 4; - static const tools::parser::token_type endloop_type = 5; - - class tokenizer : public tools::parser::tokenizer< std::istream > { - public: - tokenizer(std::istream& is, bool skipws) : - tools::parser::tokenizer< std::istream > - (is, skipws, eof_type, nl_type, word_type) - { - add_keyword("var", var_type); - add_keyword("loop", loop_type); - add_keyword("endloop", endloop_type); - } - }; - -} - -namespace quotes { - - static const tools::parser::token_type eof_type = 0; - static const tools::parser::token_type nl_type = 1; - static const tools::parser::token_type word_type = 2; - static const tools::parser::token_type dblquote_type = 3; - - class tokenizer : public tools::parser::tokenizer< std::istream > { - public: - tokenizer(std::istream& is, bool skipws) : - tools::parser::tokenizer< std::istream > - (is, skipws, eof_type, nl_type, word_type) - { - add_quote('"', dblquote_type); - } - }; - -} - -ATF_TEST_CASE(tokenizer_minimal_nows); -ATF_TEST_CASE_HEAD(tokenizer_minimal_nows) -{ - set_md_var("descr", "Tests the tokenizer class using a minimal parser " - "and not skipping whitespace"); -} -ATF_TEST_CASE_BODY(tokenizer_minimal_nows) -{ - using namespace minimal; - - { - std::istringstream iss(""); - tokenizer mt(iss, false); - - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("\n"); - tokenizer mt(iss, false); - - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("\n\n\n"); - tokenizer mt(iss, false); - - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("line 1"); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "line 1"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("line 1\n"); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "line 1"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("line 1\nline 2"); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "line 1"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, word_type, "line 2"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("line 1\nline 2\nline 3\n"); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "line 1"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, word_type, "line 2"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, word_type, "line 3"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } -} - -ATF_TEST_CASE(tokenizer_minimal_ws); -ATF_TEST_CASE_HEAD(tokenizer_minimal_ws) -{ - set_md_var("descr", "Tests the tokenizer class using a minimal parser " - "and skipping whitespace"); -} -ATF_TEST_CASE_BODY(tokenizer_minimal_ws) -{ - using namespace minimal; - - { - std::istringstream iss(""); - minimal::tokenizer mt(iss, true); - - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" \t "); - tokenizer mt(iss, true); - - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("\n"); - tokenizer mt(iss, true); - - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" \t \n \t "); - tokenizer mt(iss, true); - - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("\n\n\n"); - tokenizer mt(iss, true); - - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("line 1"); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "1"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" \tline\t 1\t"); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "1"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("line 1\n"); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "1"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("line 1\nline 2"); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "1"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "2"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("line 1\nline 2\nline 3\n"); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "1"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "2"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "3"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" \t line \t 1\n\tline\t2\n line 3 \n"); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "1"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "2"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, word_type, "line"); - EXPECT(mt, word_type, "3"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } -} - -ATF_TEST_CASE(tokenizer_delims_nows); -ATF_TEST_CASE_HEAD(tokenizer_delims_nows) -{ - set_md_var("descr", "Tests the tokenizer class using a parser with some " - "additional delimiters and not skipping whitespace"); -} -ATF_TEST_CASE_BODY(tokenizer_delims_nows) -{ - using namespace delims; - - { - std::istringstream iss("+-="); - tokenizer mt(iss, false); - - EXPECT(mt, plus_type, "+"); - EXPECT(mt, minus_type, "-"); - EXPECT(mt, equal_type, "="); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("+++"); - tokenizer mt(iss, false); - - EXPECT(mt, plus_type, "+"); - EXPECT(mt, plus_type, "+"); - EXPECT(mt, plus_type, "+"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("\n+\n++\n"); - tokenizer mt(iss, false); - - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, plus_type, "+"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, plus_type, "+"); - EXPECT(mt, plus_type, "+"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("foo+bar=baz"); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "foo"); - EXPECT(mt, plus_type, "+"); - EXPECT(mt, word_type, "bar"); - EXPECT(mt, equal_type, "="); - EXPECT(mt, word_type, "baz"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" foo\t+\tbar = baz "); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, " foo\t"); - EXPECT(mt, plus_type, "+"); - EXPECT(mt, word_type, "\tbar "); - EXPECT(mt, equal_type, "="); - EXPECT(mt, word_type, " baz "); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } -} - -ATF_TEST_CASE(tokenizer_delims_ws); -ATF_TEST_CASE_HEAD(tokenizer_delims_ws) -{ - set_md_var("descr", "Tests the tokenizer class using a parser with some " - "additional delimiters and skipping whitespace"); -} -ATF_TEST_CASE_BODY(tokenizer_delims_ws) -{ - using namespace delims; - - { - std::istringstream iss(" foo\t+\tbar = baz "); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "foo"); - EXPECT(mt, plus_type, "+"); - EXPECT(mt, word_type, "bar"); - EXPECT(mt, equal_type, "="); - EXPECT(mt, word_type, "baz"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } -} - -ATF_TEST_CASE(tokenizer_keywords_nows); -ATF_TEST_CASE_HEAD(tokenizer_keywords_nows) -{ - set_md_var("descr", "Tests the tokenizer class using a parser with some " - "additional keywords and not skipping whitespace"); -} -ATF_TEST_CASE_BODY(tokenizer_keywords_nows) -{ - using namespace keywords; - - { - std::istringstream iss("var"); - tokenizer mt(iss, false); - - EXPECT(mt, var_type, "var"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("va"); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "va"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("vara"); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "vara"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("var "); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "var "); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("var\nloop\nendloop"); - tokenizer mt(iss, false); - - EXPECT(mt, var_type, "var"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, loop_type, "loop"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, endloop_type, "endloop"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } -} - -ATF_TEST_CASE(tokenizer_keywords_ws); -ATF_TEST_CASE_HEAD(tokenizer_keywords_ws) -{ - set_md_var("descr", "Tests the tokenizer class using a parser with some " - "additional keywords and not skipping whitespace"); -} -ATF_TEST_CASE_BODY(tokenizer_keywords_ws) -{ - using namespace keywords; - - { - std::istringstream iss("var "); - tokenizer mt(iss, true); - - EXPECT(mt, var_type, "var"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" var \n\tloop\t\n \tendloop \t"); - tokenizer mt(iss, true); - - EXPECT(mt, var_type, "var"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, loop_type, "loop"); - EXPECT(mt, nl_type, "<>"); - EXPECT(mt, endloop_type, "endloop"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("var loop endloop"); - tokenizer mt(iss, true); - - EXPECT(mt, var_type, "var"); - EXPECT(mt, loop_type, "loop"); - EXPECT(mt, endloop_type, "endloop"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } -} - -ATF_TEST_CASE(tokenizer_quotes_nows); -ATF_TEST_CASE_HEAD(tokenizer_quotes_nows) -{ - set_md_var("descr", "Tests the tokenizer class using a parser with " - "quoted strings and not skipping whitespace"); -} -ATF_TEST_CASE_BODY(tokenizer_quotes_nows) -{ - using namespace quotes; - - { - std::istringstream iss("var"); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "var"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("\"var\""); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "var"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("var1\"var2\""); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "var1"); - EXPECT(mt, word_type, "var2"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss("var1\" var2 \""); - tokenizer mt(iss, false); - - EXPECT(mt, word_type, "var1"); - EXPECT(mt, word_type, " var2 "); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } -} - -ATF_TEST_CASE(tokenizer_quotes_ws); -ATF_TEST_CASE_HEAD(tokenizer_quotes_ws) -{ - set_md_var("descr", "Tests the tokenizer class using a parser with " - "quoted strings and skipping whitespace"); -} -ATF_TEST_CASE_BODY(tokenizer_quotes_ws) -{ - using namespace quotes; - - { - std::istringstream iss(" var "); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "var"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" \"var\" "); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "var"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" var1 \"var2\" "); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "var1"); - EXPECT(mt, word_type, "var2"); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } - - { - std::istringstream iss(" var1 \" var2 \" "); - tokenizer mt(iss, true); - - EXPECT(mt, word_type, "var1"); - EXPECT(mt, word_type, " var2 "); - EXPECT(mt, eof_type, "<>"); - EXPECT(mt, eof_type, "<>"); - } -} - -// ------------------------------------------------------------------------ -// Tests for the headers parser. -// ------------------------------------------------------------------------ - -class header_reader { - std::istream& m_is; - -public: - header_reader(std::istream& is) : - m_is(is) - { - } - - void - read(void) - { - std::pair< size_t, tools::parser::headers_map > hml = - tools::parser::read_headers(m_is, 1); - tools::parser::validate_content_type(hml.second, - "application/X-atf-headers-test", 1234); - } - - std::vector< std::string > m_calls; -}; - -ATF_TEST_CASE_WITHOUT_HEAD(headers_1); -ATF_TEST_CASE_BODY(headers_1) -{ - const char* input = - "" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "1: Unexpected token `<>'; expected a header name", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_2); -ATF_TEST_CASE_BODY(headers_2) -{ - const char* input = - "Content-Type\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "1: Unexpected token `<>'; expected `:'", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_3); -ATF_TEST_CASE_BODY(headers_3) -{ - const char* input = - "Content-Type:\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "1: Unexpected token `<>'; expected a textual value", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_4); -ATF_TEST_CASE_BODY(headers_4) -{ - const char* input = - "Content-Type: application/X-atf-headers-test\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "2: Unexpected token `<>'; expected a header name", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_5); -ATF_TEST_CASE_BODY(headers_5) -{ - const char* input = - "Content-Type: application/X-atf-headers-test;\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "1: Unexpected token `<>'; expected an attribute name", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_6); -ATF_TEST_CASE_BODY(headers_6) -{ - const char* input = - "Content-Type: application/X-atf-headers-test; version\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "1: Unexpected token `<>'; expected `='", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_7); -ATF_TEST_CASE_BODY(headers_7) -{ - const char* input = - "Content-Type: application/X-atf-headers-test; version=\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "1: Unexpected token `<>'; expected word or quoted string", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_8); -ATF_TEST_CASE_BODY(headers_8) -{ - const char* input = - "Content-Type: application/X-atf-headers-test; version=\"1234\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "1: Missing double quotes before end of line", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_9); -ATF_TEST_CASE_BODY(headers_9) -{ - const char* input = - "Content-Type: application/X-atf-headers-test; version=1234\"\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "1: Missing double quotes before end of line", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_10); -ATF_TEST_CASE_BODY(headers_10) -{ - const char* input = - "Content-Type: application/X-atf-headers-test; version=1234\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "2: Unexpected token `<>'; expected a header name", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_11); -ATF_TEST_CASE_BODY(headers_11) -{ - const char* input = - "Content-Type: application/X-atf-headers-test; version=\"1234\"\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "2: Unexpected token `<>'; expected a header name", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(headers_12); -ATF_TEST_CASE_BODY(headers_12) -{ - const char* input = - "Content-Type: application/X-atf-headers-test; version=\"1234\"\n" - "a b\n" - "a-b:\n" - "a-b: foo;\n" - "a-b: foo; var\n" - "a-b: foo; var=\n" - "a-b: foo; var=\"a\n" - "a-b: foo; var=a\"\n" - "a-b: foo; var=\"a\";\n" - "a-b: foo; var=\"a\"; second\n" - "a-b: foo; var=\"a\"; second=\n" - "a-b: foo; var=\"a\"; second=\"b\n" - "a-b: foo; var=\"a\"; second=b\"\n" - "a-b: foo; var=\"a\"; second=\"b\"\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "2: Unexpected token `b'; expected `:'", - "3: Unexpected token `<>'; expected a textual value", - "4: Unexpected token `<>'; expected an attribute name", - "5: Unexpected token `<>'; expected `='", - "6: Unexpected token `<>'; expected word or quoted string", - "7: Missing double quotes before end of line", - "8: Missing double quotes before end of line", - "9: Unexpected token `<>'; expected an attribute name", - "10: Unexpected token `<>'; expected `='", - "11: Unexpected token `<>'; expected word or quoted string", - "12: Missing double quotes before end of line", - "13: Missing double quotes before end of line", - NULL - }; - - do_parser_test< header_reader >(input, exp_calls, exp_errors); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add test cases for the "parse_error" class. - ATF_ADD_TEST_CASE(tcs, parse_error_to_string); - - // Add test cases for the "parse_errors" class. - ATF_ADD_TEST_CASE(tcs, parse_errors_what); - - // Add test cases for the "token" class. - ATF_ADD_TEST_CASE(tcs, token_getters); - - // Add test cases for the "tokenizer" class. - ATF_ADD_TEST_CASE(tcs, tokenizer_minimal_nows); - ATF_ADD_TEST_CASE(tcs, tokenizer_minimal_ws); - ATF_ADD_TEST_CASE(tcs, tokenizer_delims_nows); - ATF_ADD_TEST_CASE(tcs, tokenizer_delims_ws); - ATF_ADD_TEST_CASE(tcs, tokenizer_keywords_nows); - ATF_ADD_TEST_CASE(tcs, tokenizer_keywords_ws); - ATF_ADD_TEST_CASE(tcs, tokenizer_quotes_nows); - ATF_ADD_TEST_CASE(tcs, tokenizer_quotes_ws); - - // Add the tests for the headers parser. - - // Add the test cases for the header file. - ATF_ADD_TEST_CASE(tcs, headers_1); - ATF_ADD_TEST_CASE(tcs, headers_2); - ATF_ADD_TEST_CASE(tcs, headers_3); - ATF_ADD_TEST_CASE(tcs, headers_4); - ATF_ADD_TEST_CASE(tcs, headers_5); - ATF_ADD_TEST_CASE(tcs, headers_6); - ATF_ADD_TEST_CASE(tcs, headers_7); - ATF_ADD_TEST_CASE(tcs, headers_8); - ATF_ADD_TEST_CASE(tcs, headers_9); - ATF_ADD_TEST_CASE(tcs, headers_10); - ATF_ADD_TEST_CASE(tcs, headers_11); - ATF_ADD_TEST_CASE(tcs, headers_12); -} diff --git a/tools/pass_helper.cpp b/tools/pass_helper.cpp deleted file mode 100644 index 4fa75b4e93c2..000000000000 --- a/tools/pass_helper.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -ATF_TEST_CASE(main); -ATF_TEST_CASE_HEAD(main) -{ - set_md_var("descr", "Helper test case that always passes"); -} -ATF_TEST_CASE_BODY(main) -{ -} - -ATF_INIT_TEST_CASES(tcs) -{ - ATF_ADD_TEST_CASE(tcs, main); -} diff --git a/tools/process.cpp b/tools/process.cpp deleted file mode 100644 index 987a60e14e00..000000000000 --- a/tools/process.cpp +++ /dev/null @@ -1,492 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2008 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include - -#include -#include -} - -#include -#include -#include -#include -#include - -#include "defs.hpp" -#include "exceptions.hpp" -#include "text.hpp" -#include "process.hpp" - -namespace detail = tools::process::detail; -namespace impl = tools::process; -#define IMPL_NAME "tools::process" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -template< class C > -tools::auto_array< const char* > -collection_to_argv(const C& c) -{ - tools::auto_array< const char* > argv(new const char*[c.size() + 1]); - - std::size_t pos = 0; - for (typename C::const_iterator iter = c.begin(); iter != c.end(); - iter++) { - argv[pos] = (*iter).c_str(); - pos++; - } - assert(pos == c.size()); - argv[pos] = NULL; - - return argv; -} - -template< class C > -C -argv_to_collection(const char* const* argv) -{ - C c; - - for (const char* const* iter = argv; *iter != NULL; iter++) - c.push_back(std::string(*iter)); - - return c; -} - -static -void -safe_dup(const int oldfd, const int newfd) -{ - if (oldfd != newfd) { - if (dup2(oldfd, newfd) == -1) { - throw tools::system_error(IMPL_NAME "::safe_dup", - "Could not allocate file descriptor", - errno); - } else { - ::close(oldfd); - } - } -} - -static -int -const_execvp(const char *file, const char *const *argv) -{ -#define UNCONST(a) ((void *)(unsigned long)(const void *)(a)) - return ::execvp(file, (char* const*)(UNCONST(argv))); -#undef UNCONST -} - -void -detail::do_exec(void *v) -{ - struct exec_args *ea = reinterpret_cast(v); - - if (ea->m_prehook != NULL) - ea->m_prehook(); - - const int ret = const_execvp(ea->m_prog.c_str(), ea->m_argv.exec_argv()); - const int errnocopy = errno; - assert(ret == -1); - std::cerr << "exec(" << ea->m_prog.str() << ") failed: " - << std::strerror(errnocopy) << "\n"; - std::exit(EXIT_FAILURE); -} - -// ------------------------------------------------------------------------ -// The "argv_array" type. -// ------------------------------------------------------------------------ - -impl::argv_array::argv_array(void) : - m_exec_argv(collection_to_argv(m_args)) -{ -} - -impl::argv_array::argv_array(const char* arg1, ...) -{ - m_args.push_back(arg1); - - { - va_list ap; - const char* nextarg; - - va_start(ap, arg1); - while ((nextarg = va_arg(ap, const char*)) != NULL) - m_args.push_back(nextarg); - va_end(ap); - } - - ctor_init_exec_argv(); -} - -impl::argv_array::argv_array(const char* const* ca) : - m_args(argv_to_collection< args_vector >(ca)), - m_exec_argv(collection_to_argv(m_args)) -{ -} - -impl::argv_array::argv_array(const argv_array& a) : - m_args(a.m_args), - m_exec_argv(collection_to_argv(m_args)) -{ -} - -void -impl::argv_array::ctor_init_exec_argv(void) -{ - m_exec_argv = collection_to_argv(m_args); -} - -const char* const* -impl::argv_array::exec_argv(void) - const -{ - return m_exec_argv.get(); -} - -impl::argv_array::size_type -impl::argv_array::size(void) - const -{ - return m_args.size(); -} - -const char* -impl::argv_array::operator[](int idx) - const -{ - return m_args[idx].c_str(); -} - -impl::argv_array::const_iterator -impl::argv_array::begin(void) - const -{ - return m_args.begin(); -} - -impl::argv_array::const_iterator -impl::argv_array::end(void) - const -{ - return m_args.end(); -} - -impl::argv_array& -impl::argv_array::operator=(const argv_array& a) -{ - if (this != &a) { - m_args = a.m_args; - m_exec_argv = collection_to_argv(m_args); - } - return *this; -} - -// ------------------------------------------------------------------------ -// The "stream" types. -// ------------------------------------------------------------------------ - -impl::stream_capture::stream_capture(void) -{ - for (int i = 0; i < 2; i++) - m_pipefds[i] = -1; -} - -impl::stream_capture::~stream_capture(void) -{ - for (int i = 0; i < 2; i++) - if (m_pipefds[i] != -1) - ::close(m_pipefds[i]); -} - -void -impl::stream_capture::prepare(void) -{ - if (pipe(m_pipefds) == -1) - throw system_error(IMPL_NAME "::stream_capture::prepare", - "Failed to create pipe", errno); -} - -int -impl::stream_capture::connect_parent(void) -{ - ::close(m_pipefds[1]); m_pipefds[1] = -1; - const int fd = m_pipefds[0]; - m_pipefds[0] = -1; - return fd; -} - -void -impl::stream_capture::connect_child(const int fd) -{ - ::close(m_pipefds[0]); m_pipefds[0] = -1; - if (m_pipefds[1] != fd) { - safe_dup(m_pipefds[1], fd); - } - m_pipefds[1] = -1; -} - -impl::stream_connect::stream_connect(const int src_fd, const int tgt_fd) : - m_src_fd(src_fd), m_tgt_fd(tgt_fd) -{ -} - -void -impl::stream_connect::prepare(void) -{ -} - -int -impl::stream_connect::connect_parent(void) -{ - return -1; -} - -void -impl::stream_connect::connect_child(const int fd ATF_DEFS_ATTRIBUTE_UNUSED) -{ - safe_dup(m_tgt_fd, m_src_fd); -} - -impl::stream_inherit::stream_inherit(void) -{ -} - -void -impl::stream_inherit::prepare(void) -{ -} - -int -impl::stream_inherit::connect_parent(void) -{ - return -1; -} - -void -impl::stream_inherit::connect_child(const int fd ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -impl::stream_redirect_fd::stream_redirect_fd(const int fd) : - m_fd(fd) -{ -} - -void -impl::stream_redirect_fd::prepare(void) -{ -} - -int -impl::stream_redirect_fd::connect_parent(void) -{ - return -1; -} - -void -impl::stream_redirect_fd::connect_child(const int fd) -{ - safe_dup(m_fd, fd); -} - -impl::stream_redirect_path::stream_redirect_path(const tools::fs::path& p) : - m_path(p) -{ -} - -void -impl::stream_redirect_path::prepare(void) -{ -} - -int -impl::stream_redirect_path::connect_parent(void) -{ - return -1; -} - -void -impl::stream_redirect_path::connect_child(const int fd) -{ - const int aux = ::open(m_path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644); - if (aux == -1) - throw system_error(IMPL_NAME "::stream_redirect_path::connect_child", - "Could not create " + m_path.str(), errno); - else - safe_dup(aux, fd); -} - -// ------------------------------------------------------------------------ -// The "status" type. -// ------------------------------------------------------------------------ - -impl::status::status(int s) : - m_status(s) -{ -} - -impl::status::~status(void) -{ -} - -bool -impl::status::exited(void) - const -{ - int mutable_status = m_status; - return WIFEXITED(mutable_status); -} - -int -impl::status::exitstatus(void) - const -{ - assert(exited()); - int mutable_status = m_status; - return WEXITSTATUS(mutable_status); -} - -bool -impl::status::signaled(void) - const -{ - int mutable_status = m_status; - return WIFSIGNALED(mutable_status); -} - -int -impl::status::termsig(void) - const -{ - assert(signaled()); - int mutable_status = m_status; - return WTERMSIG(mutable_status); -} - -bool -impl::status::coredump(void) - const -{ - assert(signaled()); -#if defined(WCOREDUMP) - int mutable_status = m_status; - return WCOREDUMP(mutable_status); -#else - return false; -#endif -} - -// ------------------------------------------------------------------------ -// The "child" type. -// ------------------------------------------------------------------------ - -impl::child::child(const pid_t pid_arg, const int stdout_fd_arg, - const int stderr_fd_arg) : - m_pid(pid_arg), - m_stdout(stdout_fd_arg), - m_stderr(stderr_fd_arg), - m_waited(false) -{ -} - -impl::child::~child(void) -{ - if (!m_waited) { - ::kill(m_pid, SIGTERM); - (void)wait(); - - if (m_stdout != -1) - ::close(m_stdout); - if (m_stderr != -1) - ::close(m_stderr); - } -} - -impl::status -impl::child::wait(void) -{ - int s; - - if (::waitpid(m_pid, &s, 0) == -1) - throw system_error(IMPL_NAME "::child::wait", "Failed waiting for " - "process " + text::to_string(m_pid), errno); - - if (m_stdout != -1) - ::close(m_stdout); m_stdout = -1; - if (m_stderr != -1) - ::close(m_stderr); m_stderr = -1; - - m_waited = true; - return status(s); -} - -pid_t -impl::child::pid(void) - const -{ - return m_pid; -} - -int -impl::child::stdout_fd(void) -{ - return m_stdout; -} - -int -impl::child::stderr_fd(void) -{ - return m_stderr; -} - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -void -detail::flush_streams(void) -{ - // This is a weird hack to ensure that the output of the parent process - // is flushed before executing a child which prevents, for example, the - // output of the atf-run hooks to appear before the output of atf-run - // itself. - // - // TODO: This should only be executed when inheriting the stdout or - // stderr file descriptors. However, the flushing is specific to the - // iostreams, so we cannot do it from the C library where all the process - // logic is performed. Come up with a better design. - std::cout.flush(); - std::cerr.flush(); -} diff --git a/tools/process.hpp b/tools/process.hpp deleted file mode 100644 index 2ebd865a8d3f..000000000000 --- a/tools/process.hpp +++ /dev/null @@ -1,324 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2008 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_PROCESS_HPP) -#define TOOLS_PROCESS_HPP - -extern "C" { -#include - -#include -} - -#include -#include -#include -#include -#include - -#include "auto_array.hpp" -#include "exceptions.hpp" -#include "fs.hpp" - -namespace tools { -namespace process { - -class child; -class status; - -// ------------------------------------------------------------------------ -// The "argv_array" type. -// ------------------------------------------------------------------------ - -class argv_array { - typedef std::vector< std::string > args_vector; - args_vector m_args; - - // TODO: This is immutable, so we should be able to use - // std::tr1::shared_array instead when it becomes widely available. - // The reason would be to remove all copy constructors and assignment - // operators from this class. - auto_array< const char* > m_exec_argv; - void ctor_init_exec_argv(void); - -public: - typedef args_vector::const_iterator const_iterator; - typedef args_vector::size_type size_type; - - argv_array(void); - argv_array(const char*, ...); - explicit argv_array(const char* const*); - template< class C > explicit argv_array(const C&); - argv_array(const argv_array&); - - const char* const* exec_argv(void) const; - size_type size(void) const; - const char* operator[](int) const; - - const_iterator begin(void) const; - const_iterator end(void) const; - - argv_array& operator=(const argv_array&); -}; - -template< class C > -argv_array::argv_array(const C& c) -{ - for (typename C::const_iterator iter = c.begin(); iter != c.end(); - iter++) - m_args.push_back(*iter); - ctor_init_exec_argv(); -} - -// ------------------------------------------------------------------------ -// The "stream" types. -// ------------------------------------------------------------------------ - -class stream_capture { - int m_pipefds[2]; - - // Allow access to the getters. - template< class OutStream, class ErrStream > friend - child fork(void (*)(void*), OutStream, ErrStream, void*); - template< class OutStream, class ErrStream > friend - status exec(const tools::fs::path&, const argv_array&, - const OutStream&, const ErrStream&, void (*)(void)); - - void prepare(void); - int connect_parent(void); - void connect_child(const int); - -public: - stream_capture(void); - ~stream_capture(void); -}; - -class stream_connect { - int m_src_fd; - int m_tgt_fd; - - // Allow access to the getters. - template< class OutStream, class ErrStream > friend - child fork(void (*)(void*), OutStream, ErrStream, void*); - template< class OutStream, class ErrStream > friend - status exec(const tools::fs::path&, const argv_array&, - const OutStream&, const ErrStream&, void (*)(void)); - - void prepare(void); - int connect_parent(void); - void connect_child(const int); - -public: - stream_connect(const int, const int); -}; - -class stream_inherit { - // Allow access to the getters. - template< class OutStream, class ErrStream > friend - child fork(void (*)(void*), OutStream, ErrStream, void*); - template< class OutStream, class ErrStream > friend - status exec(const tools::fs::path&, const argv_array&, - const OutStream&, const ErrStream&, void (*)(void)); - - void prepare(void); - int connect_parent(void); - void connect_child(const int); - -public: - stream_inherit(void); -}; - -class stream_redirect_fd { - int m_fd; - - // Allow access to the getters. - template< class OutStream, class ErrStream > friend - child fork(void (*)(void*), OutStream, ErrStream, void*); - template< class OutStream, class ErrStream > friend - status exec(const tools::fs::path&, const argv_array&, - const OutStream&, const ErrStream&, void (*)(void)); - - void prepare(void); - int connect_parent(void); - void connect_child(const int); - -public: - stream_redirect_fd(const int); -}; - -class stream_redirect_path { - const tools::fs::path m_path; - - // Allow access to the getters. - template< class OutStream, class ErrStream > friend - child fork(void (*)(void*), OutStream, ErrStream, void*); - template< class OutStream, class ErrStream > friend - status exec(const tools::fs::path&, const argv_array&, - const OutStream&, const ErrStream&, void (*)(void)); - - void prepare(void); - int connect_parent(void); - void connect_child(const int); - -public: - stream_redirect_path(const tools::fs::path&); -}; - -// ------------------------------------------------------------------------ -// The "status" type. -// ------------------------------------------------------------------------ - -class status { - int m_status; - - friend class child; - template< class OutStream, class ErrStream > friend - status exec(const tools::fs::path&, const argv_array&, - const OutStream&, const ErrStream&, void (*)(void)); - - status(int); - -public: - ~status(void); - - bool exited(void) const; - int exitstatus(void) const; - - bool signaled(void) const; - int termsig(void) const; - bool coredump(void) const; -}; - -// ------------------------------------------------------------------------ -// The "child" type. -// ------------------------------------------------------------------------ - -class child { - pid_t m_pid; - - int m_stdout; - int m_stderr; - - bool m_waited; - - template< class OutStream, class ErrStream > friend - child fork(void (*)(void*), OutStream, ErrStream, void*); - - child(const pid_t, const int, const int); - -public: - ~child(void); - - status wait(void); - - pid_t pid(void) const; - int stdout_fd(void); - int stderr_fd(void); -}; - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -namespace detail { -void flush_streams(void); - -struct exec_args { - const tools::fs::path m_prog; - const argv_array& m_argv; - void (*m_prehook)(void); -}; - -void do_exec(void *); -} // namespace detail - -// TODO: The void* cookie can probably be templatized, thus also allowing -// const data structures. -template< class OutStream, class ErrStream > -child -fork(void (*start)(void*), OutStream outsb, ErrStream errsb, void* v) -{ - detail::flush_streams(); - - outsb.prepare(); - errsb.prepare(); - - pid_t pid = ::fork(); - if (pid == -1) { - throw system_error("tools::process::child::fork", - "Failed to fork", errno); - } else if (pid == 0) { - try { - outsb.connect_child(STDOUT_FILENO); - errsb.connect_child(STDERR_FILENO); - start(v); - std::abort(); - } catch (...) { - std::cerr << "Unhandled error while running subprocess\n"; - std::exit(EXIT_FAILURE); - } - } else { - const int stdout_fd = outsb.connect_parent(); - const int stderr_fd = errsb.connect_parent(); - return child(pid, stdout_fd, stderr_fd); - } -} - -template< class OutStream, class ErrStream > -status -exec(const tools::fs::path& prog, const argv_array& argv, - const OutStream& outsb, const ErrStream& errsb, - void (*prehook)(void)) -{ - struct detail::exec_args ea = { prog, argv, prehook }; - child c = fork(detail::do_exec, outsb, errsb, &ea); - -again: - try { - return c.wait(); - } catch (const system_error& e) { - if (e.code() == EINTR) - goto again; - else - throw e; - } -} - -template< class OutStream, class ErrStream > -status -exec(const tools::fs::path& prog, const argv_array& argv, - const OutStream& outsb, const ErrStream& errsb) -{ - return exec(prog, argv, outsb, errsb, NULL); -} - -} // namespace process -} // namespace tools - -#endif // !defined(TOOLS_PROCESS_HPP) diff --git a/tools/process_helpers.c b/tools/process_helpers.c deleted file mode 100644 index 61f1b67c980e..000000000000 --- a/tools/process_helpers.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Automated Testing Framework (atf) - * - * Copyright (c) 2008 The NetBSD Foundation, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include - -#include /* NO_CHECK_STYLE */ -#include -#include -#include -#include -#include - -static -int -h_echo(const char *msg) -{ - printf("%s\n", msg); - return EXIT_SUCCESS; -} - -static -int -h_exit_failure(void) -{ - return EXIT_FAILURE; -} - -static -int -h_exit_signal(void) -{ - kill(getpid(), SIGKILL); - assert(0); /* NO_CHECK_STYLE */ - return EXIT_FAILURE; -} - -static -int -h_exit_success(void) -{ - return EXIT_SUCCESS; -} - -static -int -h_stdout_stderr(const char *id) -{ - fprintf(stdout, "Line 1 to stdout for %s\n", id); - fprintf(stdout, "Line 2 to stdout for %s\n", id); - fprintf(stderr, "Line 1 to stderr for %s\n", id); - fprintf(stderr, "Line 2 to stderr for %s\n", id); - - return EXIT_SUCCESS; -} - -static -void -check_args(const int argc, const char *const argv[], const int required) -{ - if (argc < required) { - fprintf(stderr, "Usage: %s helper-name [args]\n", argv[0]); - exit(EXIT_FAILURE); - } -} - -int -main(int argc, const char *const argv[]) -{ - int exitcode; - - check_args(argc, argv, 2); - - if (strcmp(argv[1], "echo") == 0) { - check_args(argc, argv, 3); - exitcode = h_echo(argv[2]); - } else if (strcmp(argv[1], "exit-failure") == 0) - exitcode = h_exit_failure(); - else if (strcmp(argv[1], "exit-signal") == 0) - exitcode = h_exit_signal(); - else if (strcmp(argv[1], "exit-success") == 0) - exitcode = h_exit_success(); - else if (strcmp(argv[1], "stdout-stderr") == 0) { - check_args(argc, argv, 3); - exitcode = h_stdout_stderr(argv[2]); - } else { - fprintf(stderr, "%s: Unknown helper %s\n", argv[0], argv[1]); - exitcode = EXIT_FAILURE; - } - - return exitcode; -} diff --git a/tools/process_test.cpp b/tools/process_test.cpp deleted file mode 100644 index 70da919dd0eb..000000000000 --- a/tools/process_test.cpp +++ /dev/null @@ -1,360 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2008 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include - -#include - -#include "process.hpp" -#include "test_helpers.hpp" - -// TODO: Testing the fork function is a huge task and I'm afraid of -// copy/pasting tons of stuff from the C version. I'd rather not do that -// until some code can be shared, which cannot happen until the C++ binding -// is cleaned by a fair amount. Instead... just rely (at the moment) on -// the system tests for the tools using this module. - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -static -std::size_t -array_size(const char* const* array) -{ - std::size_t size = 0; - - for (const char* const* ptr = array; *ptr != NULL; ptr++) - size++; - - return size; -} - -static -tools::process::status -exec_process_helpers(const atf::tests::tc& tc, const char* helper_name) -{ - using tools::process::exec; - - const tools::fs::path helpers = tools::fs::path(tc.get_config_var("srcdir")) / - "process_helpers"; - - std::vector< std::string > argv; - argv.push_back(helpers.leaf_name()); - argv.push_back(helper_name); - - return exec(helpers, - tools::process::argv_array(argv), - tools::process::stream_inherit(), - tools::process::stream_inherit()); -} - -// ------------------------------------------------------------------------ -// Tests for the "argv_array" type. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(argv_array_init_carray); -ATF_TEST_CASE_HEAD(argv_array_init_carray) -{ - set_md_var("descr", "Tests that argv_array is correctly constructed " - "from a C-style array of strings"); -} -ATF_TEST_CASE_BODY(argv_array_init_carray) -{ - { - const char* const carray[] = { NULL }; - tools::process::argv_array argv(carray); - - ATF_REQUIRE_EQ(argv.size(), 0); - } - - { - const char* const carray[] = { "arg0", NULL }; - tools::process::argv_array argv(carray); - - ATF_REQUIRE_EQ(argv.size(), 1); - ATF_REQUIRE(std::strcmp(argv[0], carray[0]) == 0); - } - - { - const char* const carray[] = { "arg0", "arg1", "arg2", NULL }; - tools::process::argv_array argv(carray); - - ATF_REQUIRE_EQ(argv.size(), 3); - ATF_REQUIRE(std::strcmp(argv[0], carray[0]) == 0); - ATF_REQUIRE(std::strcmp(argv[1], carray[1]) == 0); - ATF_REQUIRE(std::strcmp(argv[2], carray[2]) == 0); - } -} - -ATF_TEST_CASE(argv_array_init_col); -ATF_TEST_CASE_HEAD(argv_array_init_col) -{ - set_md_var("descr", "Tests that argv_array is correctly constructed " - "from a string collection"); -} -ATF_TEST_CASE_BODY(argv_array_init_col) -{ - { - std::vector< std::string > col; - tools::process::argv_array argv(col); - - ATF_REQUIRE_EQ(argv.size(), 0); - } - - { - std::vector< std::string > col; - col.push_back("arg0"); - tools::process::argv_array argv(col); - - ATF_REQUIRE_EQ(argv.size(), 1); - ATF_REQUIRE_EQ(argv[0], col[0]); - } - - { - std::vector< std::string > col; - col.push_back("arg0"); - col.push_back("arg1"); - col.push_back("arg2"); - tools::process::argv_array argv(col); - - ATF_REQUIRE_EQ(argv.size(), 3); - ATF_REQUIRE_EQ(argv[0], col[0]); - ATF_REQUIRE_EQ(argv[1], col[1]); - ATF_REQUIRE_EQ(argv[2], col[2]); - } -} - -ATF_TEST_CASE(argv_array_init_empty); -ATF_TEST_CASE_HEAD(argv_array_init_empty) -{ - set_md_var("descr", "Tests that argv_array is correctly constructed " - "by the default constructor"); -} -ATF_TEST_CASE_BODY(argv_array_init_empty) -{ - tools::process::argv_array argv; - - ATF_REQUIRE_EQ(argv.size(), 0); -} - -ATF_TEST_CASE(argv_array_init_varargs); -ATF_TEST_CASE_HEAD(argv_array_init_varargs) -{ - set_md_var("descr", "Tests that argv_array is correctly constructed " - "from a variable list of arguments"); -} -ATF_TEST_CASE_BODY(argv_array_init_varargs) -{ - { - tools::process::argv_array argv("arg0", NULL); - - ATF_REQUIRE_EQ(argv.size(), 1); - ATF_REQUIRE_EQ(argv[0], std::string("arg0")); - } - - { - tools::process::argv_array argv("arg0", "arg1", "arg2", NULL); - - ATF_REQUIRE_EQ(argv.size(), 3); - ATF_REQUIRE_EQ(argv[0], std::string("arg0")); - ATF_REQUIRE_EQ(argv[1], std::string("arg1")); - ATF_REQUIRE_EQ(argv[2], std::string("arg2")); - } -} - -ATF_TEST_CASE(argv_array_assign); -ATF_TEST_CASE_HEAD(argv_array_assign) -{ - set_md_var("descr", "Tests that assigning an argv_array works"); -} -ATF_TEST_CASE_BODY(argv_array_assign) -{ - using tools::process::argv_array; - - const char* const carray1[] = { "arg1", NULL }; - const char* const carray2[] = { "arg1", "arg2", NULL }; - - std::auto_ptr< argv_array > argv1(new argv_array(carray1)); - std::auto_ptr< argv_array > argv2(new argv_array(carray2)); - - *argv2 = *argv1; - ATF_REQUIRE_EQ(argv2->size(), argv1->size()); - ATF_REQUIRE(std::strcmp((*argv2)[0], (*argv1)[0]) == 0); - - ATF_REQUIRE(argv2->exec_argv() != argv1->exec_argv()); - argv1.release(); - { - const char* const* eargv2 = argv2->exec_argv(); - ATF_REQUIRE(std::strcmp(eargv2[0], carray1[0]) == 0); - ATF_REQUIRE_EQ(eargv2[1], static_cast< const char* >(NULL)); - } - - argv2.release(); -} - -ATF_TEST_CASE(argv_array_copy); -ATF_TEST_CASE_HEAD(argv_array_copy) -{ - set_md_var("descr", "Tests that copying an argv_array constructed from " - "a C-style array of strings works"); -} -ATF_TEST_CASE_BODY(argv_array_copy) -{ - using tools::process::argv_array; - - const char* const carray[] = { "arg0", NULL }; - - std::auto_ptr< argv_array > argv1(new argv_array(carray)); - std::auto_ptr< argv_array > argv2(new argv_array(*argv1)); - - ATF_REQUIRE_EQ(argv2->size(), argv1->size()); - ATF_REQUIRE(std::strcmp((*argv2)[0], (*argv1)[0]) == 0); - - ATF_REQUIRE(argv2->exec_argv() != argv1->exec_argv()); - argv1.release(); - { - const char* const* eargv2 = argv2->exec_argv(); - ATF_REQUIRE(std::strcmp(eargv2[0], carray[0]) == 0); - ATF_REQUIRE_EQ(eargv2[1], static_cast< const char* >(NULL)); - } - - argv2.release(); -} - -ATF_TEST_CASE(argv_array_exec_argv); -ATF_TEST_CASE_HEAD(argv_array_exec_argv) -{ - set_md_var("descr", "Tests that the exec argv provided by an argv_array " - "is correct"); -} -ATF_TEST_CASE_BODY(argv_array_exec_argv) -{ - using tools::process::argv_array; - - { - argv_array argv; - const char* const* eargv = argv.exec_argv(); - ATF_REQUIRE_EQ(array_size(eargv), 0); - ATF_REQUIRE_EQ(eargv[0], static_cast< const char* >(NULL)); - } - - { - const char* const carray[] = { "arg0", NULL }; - argv_array argv(carray); - const char* const* eargv = argv.exec_argv(); - ATF_REQUIRE_EQ(array_size(eargv), 1); - ATF_REQUIRE(std::strcmp(eargv[0], "arg0") == 0); - ATF_REQUIRE_EQ(eargv[1], static_cast< const char* >(NULL)); - } - - { - std::vector< std::string > col; - col.push_back("arg0"); - argv_array argv(col); - const char* const* eargv = argv.exec_argv(); - ATF_REQUIRE_EQ(array_size(eargv), 1); - ATF_REQUIRE(std::strcmp(eargv[0], "arg0") == 0); - ATF_REQUIRE_EQ(eargv[1], static_cast< const char* >(NULL)); - } -} - -ATF_TEST_CASE(argv_array_iter); -ATF_TEST_CASE_HEAD(argv_array_iter) -{ - set_md_var("descr", "Tests that an argv_array can be iterated"); -} -ATF_TEST_CASE_BODY(argv_array_iter) -{ - using tools::process::argv_array; - - std::vector< std::string > vector; - vector.push_back("arg0"); - vector.push_back("arg1"); - vector.push_back("arg2"); - - argv_array argv(vector); - ATF_REQUIRE_EQ(argv.size(), 3); - std::vector< std::string >::size_type pos = 0; - for (argv_array::const_iterator iter = argv.begin(); iter != argv.end(); - iter++) { - ATF_REQUIRE_EQ(*iter, vector[pos]); - pos++; - } -} - -// ------------------------------------------------------------------------ -// Tests cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(exec_failure); -ATF_TEST_CASE_HEAD(exec_failure) -{ - set_md_var("descr", "Tests execing a command that reports failure"); -} -ATF_TEST_CASE_BODY(exec_failure) -{ - const tools::process::status s = exec_process_helpers(*this, "exit-failure"); - ATF_REQUIRE(s.exited()); - ATF_REQUIRE_EQ(s.exitstatus(), EXIT_FAILURE); -} - -ATF_TEST_CASE(exec_success); -ATF_TEST_CASE_HEAD(exec_success) -{ - set_md_var("descr", "Tests execing a command that reports success"); -} -ATF_TEST_CASE_BODY(exec_success) -{ - const tools::process::status s = exec_process_helpers(*this, "exit-success"); - ATF_REQUIRE(s.exited()); - ATF_REQUIRE_EQ(s.exitstatus(), EXIT_SUCCESS); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the test cases for the "argv_array" type. - ATF_ADD_TEST_CASE(tcs, argv_array_assign); - ATF_ADD_TEST_CASE(tcs, argv_array_copy); - ATF_ADD_TEST_CASE(tcs, argv_array_exec_argv); - ATF_ADD_TEST_CASE(tcs, argv_array_init_carray); - ATF_ADD_TEST_CASE(tcs, argv_array_init_col); - ATF_ADD_TEST_CASE(tcs, argv_array_init_empty); - ATF_ADD_TEST_CASE(tcs, argv_array_init_varargs); - ATF_ADD_TEST_CASE(tcs, argv_array_iter); - - // Add the test cases for the free functions. - ATF_ADD_TEST_CASE(tcs, exec_failure); - ATF_ADD_TEST_CASE(tcs, exec_success); -} diff --git a/tools/reader.cpp b/tools/reader.cpp deleted file mode 100644 index 67fce662a192..000000000000 --- a/tools/reader.cpp +++ /dev/null @@ -1,440 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -} - -#include -#include -#include -#include -#include - -#include "defs.hpp" -#include "parser.hpp" -#include "reader.hpp" -#include "text.hpp" - -namespace impl = tools::atf_report; -#define IMPL_NAME "tools::atf_report" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -template< typename Type > -Type -string_to_int(const std::string& str) -{ - std::istringstream ss(str); - Type s; - ss >> s; - - return s; -} - -// ------------------------------------------------------------------------ -// The "atf_tps" auxiliary parser. -// ------------------------------------------------------------------------ - -namespace atf_tps { - -static const tools::parser::token_type eof_type = 0; -static const tools::parser::token_type nl_type = 1; -static const tools::parser::token_type text_type = 2; -static const tools::parser::token_type colon_type = 3; -static const tools::parser::token_type comma_type = 4; -static const tools::parser::token_type tps_count_type = 5; -static const tools::parser::token_type tp_start_type = 6; -static const tools::parser::token_type tp_end_type = 7; -static const tools::parser::token_type tc_start_type = 8; -static const tools::parser::token_type tc_so_type = 9; -static const tools::parser::token_type tc_se_type = 10; -static const tools::parser::token_type tc_end_type = 11; -static const tools::parser::token_type passed_type = 12; -static const tools::parser::token_type failed_type = 13; -static const tools::parser::token_type skipped_type = 14; -static const tools::parser::token_type info_type = 16; -static const tools::parser::token_type expected_death_type = 17; -static const tools::parser::token_type expected_exit_type = 18; -static const tools::parser::token_type expected_failure_type = 19; -static const tools::parser::token_type expected_signal_type = 20; -static const tools::parser::token_type expected_timeout_type = 21; - -class tokenizer : public tools::parser::tokenizer< std::istream > { -public: - tokenizer(std::istream& is, size_t curline) : - tools::parser::tokenizer< std::istream > - (is, true, eof_type, nl_type, text_type, curline) - { - add_delim(':', colon_type); - add_delim(',', comma_type); - add_keyword("tps-count", tps_count_type); - add_keyword("tp-start", tp_start_type); - add_keyword("tp-end", tp_end_type); - add_keyword("tc-start", tc_start_type); - add_keyword("tc-so", tc_so_type); - add_keyword("tc-se", tc_se_type); - add_keyword("tc-end", tc_end_type); - add_keyword("passed", passed_type); - add_keyword("failed", failed_type); - add_keyword("skipped", skipped_type); - add_keyword("info", info_type); - add_keyword("expected_death", expected_death_type); - add_keyword("expected_exit", expected_exit_type); - add_keyword("expected_failure", expected_failure_type); - add_keyword("expected_signal", expected_signal_type); - add_keyword("expected_timeout", expected_timeout_type); - } -}; - -} // namespace atf_tps - -struct timeval -read_timeval(tools::parser::parser< atf_tps::tokenizer >& parser) -{ - using namespace atf_tps; - - tools::parser::token t = parser.expect(text_type, "timestamp"); - const std::string::size_type divider = t.text().find('.'); - if (divider == std::string::npos || divider == 0 || - divider == t.text().length() - 1) - throw tools::parser::parse_error(t.lineno(), - "Malformed timestamp value " + t.text()); - - struct timeval tv; - tv.tv_sec = string_to_int< long >(t.text().substr(0, divider)); - tv.tv_usec = string_to_int< long >(t.text().substr(divider + 1)); - return tv; -} - -// ------------------------------------------------------------------------ -// The "atf_tps_reader" class. -// ------------------------------------------------------------------------ - -impl::atf_tps_reader::atf_tps_reader(std::istream& is) : - m_is(is) -{ -} - -impl::atf_tps_reader::~atf_tps_reader(void) -{ -} - -void -impl::atf_tps_reader::got_info( - const std::string& what ATF_DEFS_ATTRIBUTE_UNUSED, - const std::string& val ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::atf_tps_reader::got_ntps(size_t ntps ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::atf_tps_reader::got_tp_start( - const std::string& tp ATF_DEFS_ATTRIBUTE_UNUSED, - size_t ntcs ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::atf_tps_reader::got_tp_end( - struct timeval* tv ATF_DEFS_ATTRIBUTE_UNUSED, - const std::string& reason ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::atf_tps_reader::got_tc_start( - const std::string& tcname ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::atf_tps_reader::got_tc_stdout_line( - const std::string& line ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::atf_tps_reader::got_tc_stderr_line( - const std::string& line ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::atf_tps_reader::got_tc_end( - const std::string& state ATF_DEFS_ATTRIBUTE_UNUSED, - struct timeval* tv ATF_DEFS_ATTRIBUTE_UNUSED, - const std::string& reason ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -impl::atf_tps_reader::got_eof(void) -{ -} - -void -impl::atf_tps_reader::read_info(void* pptr) -{ - using tools::parser::parse_error; - using namespace atf_tps; - - tools::parser::parser< tokenizer >& p = - *reinterpret_cast< tools::parser::parser< tokenizer >* > - (pptr); - - (void)p.expect(colon_type, "`:'"); - - tools::parser::token t = p.expect(text_type, "info property name"); - (void)p.expect(comma_type, "`,'"); - got_info(t.text(), tools::text::trim(p.rest_of_line())); - - (void)p.expect(nl_type, "new line"); -} - -void -impl::atf_tps_reader::read_tp(void* pptr) -{ - using tools::parser::parse_error; - using namespace atf_tps; - - tools::parser::parser< tokenizer >& p = - *reinterpret_cast< tools::parser::parser< tokenizer >* > - (pptr); - - tools::parser::token t = p.expect(tp_start_type, - "start of test program"); - - t = p.expect(colon_type, "`:'"); - - struct timeval s1 = read_timeval(p); - - t = p.expect(comma_type, "`,'"); - - t = p.expect(text_type, "test program name"); - std::string tpname = t.text(); - - t = p.expect(comma_type, "`,'"); - - t = p.expect(text_type, "number of test programs"); - size_t ntcs = string_to_int< std::size_t >(t.text()); - - t = p.expect(nl_type, "new line"); - - ATF_PARSER_CALLBACK(p, got_tp_start(tpname, ntcs)); - - size_t i = 0; - while (p.good() && i < ntcs) { - try { - read_tc(&p); - i++; - } catch (const parse_error& pe) { - p.add_error(pe); - p.reset(nl_type); - } - } - t = p.expect(tp_end_type, "end of test program"); - - t = p.expect(colon_type, "`:'"); - - struct timeval s2 = read_timeval(p); - - struct timeval s3; - timersub(&s2, &s1, &s3); - - t = p.expect(comma_type, "`,'"); - - t = p.expect(text_type, "test program name"); - if (t.text() != tpname) - throw parse_error(t.lineno(), "Test program name used in " - "terminator does not match " - "opening"); - - t = p.expect(nl_type, comma_type, - "new line or comma_type"); - std::string reason; - if (t.type() == comma_type) { - reason = tools::text::trim(p.rest_of_line()); - if (reason.empty()) - throw parse_error(t.lineno(), - "Empty reason for failed test program"); - t = p.next(); - } - - ATF_PARSER_CALLBACK(p, got_tp_end(&s3, reason)); -} - -void -impl::atf_tps_reader::read_tc(void* pptr) -{ - using tools::parser::parse_error; - using namespace atf_tps; - - tools::parser::parser< tokenizer >& p = - *reinterpret_cast< tools::parser::parser< tokenizer >* > - (pptr); - - tools::parser::token t = p.expect(tc_start_type, "start of test case"); - - t = p.expect(colon_type, "`:'"); - - struct timeval s1 = read_timeval(p); - - t = p.expect(comma_type, "`,'"); - - t = p.expect(text_type, "test case name"); - std::string tcname = t.text(); - - ATF_PARSER_CALLBACK(p, got_tc_start(tcname)); - - t = p.expect(nl_type, "new line"); - - t = p.expect(tc_end_type, tc_so_type, tc_se_type, - "end of test case or test case's stdout/stderr line"); - while (t.type() != tc_end_type && - (t.type() == tc_so_type || t.type() == tc_se_type)) { - tools::parser::token t2 = t; - - t = p.expect(colon_type, "`:'"); - - std::string line = p.rest_of_line(); - - if (t2.type() == tc_so_type) { - ATF_PARSER_CALLBACK(p, got_tc_stdout_line(line)); - } else { - assert(t2.type() == tc_se_type); - ATF_PARSER_CALLBACK(p, got_tc_stderr_line(line)); - } - - t = p.expect(nl_type, "new line"); - - t = p.expect(tc_end_type, tc_so_type, tc_se_type, - "end of test case or test case's stdout/stderr line"); - } - - t = p.expect(colon_type, "`:'"); - - struct timeval s2 = read_timeval(p); - - struct timeval s3; - timersub(&s2, &s1, &s3); - - t = p.expect(comma_type, "`,'"); - - t = p.expect(text_type, "test case name"); - if (t.text() != tcname) - throw parse_error(t.lineno(), - "Test case name used in terminator does not " - "match opening"); - - t = p.expect(comma_type, "`,'"); - - t = p.expect(expected_death_type, expected_exit_type, expected_failure_type, - expected_signal_type, expected_timeout_type, passed_type, failed_type, - skipped_type, "expected_{death,exit,failure,signal,timeout}, failed, " - "passed or skipped"); - if (t.type() == passed_type) { - ATF_PARSER_CALLBACK(p, got_tc_end("passed", &s3, "")); - } else { - std::string state; - if (t.type() == expected_death_type) state = "expected_death"; - else if (t.type() == expected_exit_type) state = "expected_exit"; - else if (t.type() == expected_failure_type) state = "expected_failure"; - else if (t.type() == expected_signal_type) state = "expected_signal"; - else if (t.type() == expected_timeout_type) state = "expected_timeout"; - else if (t.type() == failed_type) state = "failed"; - else if (t.type() == skipped_type) state = "skipped"; - else std::abort(); - - t = p.expect(comma_type, "`,'"); - std::string reason = tools::text::trim(p.rest_of_line()); - if (reason.empty()) - throw parse_error(t.lineno(), "Empty reason for " + state + - " test case result"); - ATF_PARSER_CALLBACK(p, got_tc_end(state, &s3, reason)); - } - - t = p.expect(nl_type, "new line"); -} - -void -impl::atf_tps_reader::read(void) -{ - using tools::parser::parse_error; - using namespace atf_tps; - - std::pair< size_t, tools::parser::headers_map > hml = - tools::parser::read_headers(m_is, 1); - tools::parser::validate_content_type(hml.second, - "application/X-atf-tps", 3); - - tokenizer tkz(m_is, hml.first); - tools::parser::parser< tokenizer > p(tkz); - - try { - tools::parser::token t; - - while ((t = p.expect(tps_count_type, info_type, "tps-count or info " - "field")).type() == info_type) - read_info(&p); - - t = p.expect(colon_type, "`:'"); - - t = p.expect(text_type, "number of test programs"); - size_t ntps = string_to_int< std::size_t >(t.text()); - ATF_PARSER_CALLBACK(p, got_ntps(ntps)); - - t = p.expect(nl_type, "new line"); - - size_t i = 0; - while (p.good() && i < ntps) { - try { - read_tp(&p); - i++; - } catch (const parse_error& pe) { - p.add_error(pe); - p.reset(nl_type); - } - } - - while ((t = p.expect(eof_type, info_type, "end of stream or info " - "field")).type() == info_type) - read_info(&p); - ATF_PARSER_CALLBACK(p, got_eof()); - } catch (const parse_error& pe) { - p.add_error(pe); - p.reset(nl_type); - } -} diff --git a/tools/reader.hpp b/tools/reader.hpp deleted file mode 100644 index 34d5d25f01f9..000000000000 --- a/tools/reader.hpp +++ /dev/null @@ -1,89 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_FORMATS_HPP) -#define TOOLS_FORMATS_HPP - -extern "C" { -#include -} - -#include -#include - -namespace tools { -namespace atf_report { - -struct test_case_result { - enum state_enum { - PASSED, - FAILED, - SKIPPED, - }; - const state_enum state; - const std::string& reason; - - test_case_result(const state_enum p_state, const std::string& p_reason) : - state(p_state), - reason(p_reason) - { - } -}; - -class atf_tps_reader { - std::istream& m_is; - - void read_info(void*); - void read_tp(void*); - void read_tc(void*); - -protected: - virtual void got_info(const std::string&, const std::string&); - virtual void got_ntps(size_t); - virtual void got_tp_start(const std::string&, size_t); - virtual void got_tp_end(struct timeval*, const std::string&); - - virtual void got_tc_start(const std::string&); - virtual void got_tc_stdout_line(const std::string&); - virtual void got_tc_stderr_line(const std::string&); - virtual void got_tc_end(const std::string&, struct timeval*, - const std::string&); - virtual void got_eof(void); - -public: - atf_tps_reader(std::istream&); - virtual ~atf_tps_reader(void); - - void read(void); -}; - -} // namespace atf_report -} // namespace tools - -#endif // !defined(TOOLS_FORMATS_HPP) diff --git a/tools/reader_test.cpp b/tools/reader_test.cpp deleted file mode 100644 index 3e53e064d314..000000000000 --- a/tools/reader_test.cpp +++ /dev/null @@ -1,987 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include -#include -#include -#include - -#include - -#include "parser.hpp" -#include "reader.hpp" -#include "test_helpers.hpp" -#include "text.hpp" - -namespace impl = tools::atf_report; - -class tps_reader : protected impl::atf_tps_reader { - void - got_info(const std::string& what, const std::string& val) - { - m_calls.push_back("got_info(" + what + ", " + val + ")"); - } - - void - got_ntps(size_t ntps) - { - m_calls.push_back("got_ntps(" + tools::text::to_string(ntps) + ")"); - } - - void - got_tp_start(const std::string& tpname, size_t ntcs) - { - m_calls.push_back("got_tp_start(" + tpname + ", " + - tools::text::to_string(ntcs) + ")"); - } - - void - got_tp_end(struct timeval* tv ATF_DEFS_ATTRIBUTE_UNUSED, - const std::string& reason) - { - m_calls.push_back("got_tp_end(" + reason + ")"); - } - - void - got_tc_start(const std::string& tcname) - { - m_calls.push_back("got_tc_start(" + tcname + ")"); - } - - void - got_tc_end(const std::string& state, - struct timeval* tv ATF_DEFS_ATTRIBUTE_UNUSED, - const std::string& reason) - { - const std::string r = state + (reason.empty() ? "" : ", " + reason); - m_calls.push_back("got_tc_end(" + r + ")"); - } - - void - got_tc_stdout_line(const std::string& line) - { - m_calls.push_back("got_tc_stdout_line(" + line + ")"); - } - - void - got_tc_stderr_line(const std::string& line) - { - m_calls.push_back("got_tc_stderr_line(" + line + ")"); - } - - void - got_eof(void) - { - m_calls.push_back("got_eof()"); - } - -public: - tps_reader(std::istream& is) : - impl::atf_tps_reader(is) - { - } - - void - read(void) - { - atf_tps_reader::read(); - } - - std::vector< std::string > m_calls; -}; - -ATF_TEST_CASE_WITHOUT_HEAD(tps_1); -ATF_TEST_CASE_BODY(tps_1) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 0\n" - ; - - const char* exp_calls[] = { - "got_ntps(0)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_2); -ATF_TEST_CASE_BODY(tps_2) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 2\n" - "tp-start: 123.456, first-prog, 0\n" - "tp-end: 123.567, first-prog\n" - "tp-start: 123.678, second-prog, 0\n" - "tp-end: 123.789, second-prog, This program failed\n" - ; - - const char* exp_calls[] = { - "got_ntps(2)", - "got_tp_start(first-prog, 0)", - "got_tp_end()", - "got_tp_start(second-prog, 0)", - "got_tp_end(This program failed)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_3); -ATF_TEST_CASE_BODY(tps_3) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 2\n" - "tp-start: 123.123, first-prog, 3\n" - "tc-start: 123.234, first-test\n" - "tc-end: 123.345, first-test, passed\n" - "tc-start: 123.456, second-test\n" - "tc-end: 123.567, second-test, skipped, Testing skipped reason\n" - "tc-start: 123.678, third.test\n" - "tc-end: 123.789, third.test, failed, Testing failed reason\n" - "tp-end: 123.890, first-prog\n" - "tp-start: 124.901, second-prog, 3\n" - "tc-start: 124.1012, first-test\n" - "tc-so:first stdout line for 1st test\n" - "tc-se:first stderr line for 1st test\n" - "tc-so:second stdout line for 1st test\n" - "tc-se:second stderr line for 1st test\n" - "tc-end: 124.1123, first-test, passed\n" - "tc-start: 124.1234, second-test\n" - "tc-so:first stdout line for 2nd test\n" - "tc-se:first stderr line for 2nd test\n" - "tc-so:second stdout line for 2nd test\n" - "tc-se:second stderr line for 2nd test\n" - "tc-end: 124.1345, second-test, skipped, Testing skipped reason\n" - "tc-start: 124.1456, third.test\n" - "tc-so:first stdout line for 3rd test\n" - "tc-se:first stderr line for 3rd test\n" - "tc-so:second stdout line for 3rd test\n" - "tc-se:second stderr line for 3rd test\n" - "tc-end: 124.1567, third.test, failed, Testing failed reason\n" - "tp-end: 124.1678, second-prog, This program failed\n" - ; - - const char* exp_calls[] = { - "got_ntps(2)", - "got_tp_start(first-prog, 3)", - "got_tc_start(first-test)", - "got_tc_end(passed)", - "got_tc_start(second-test)", - "got_tc_end(skipped, Testing skipped reason)", - "got_tc_start(third.test)", - "got_tc_end(failed, Testing failed reason)", - "got_tp_end()", - "got_tp_start(second-prog, 3)", - "got_tc_start(first-test)", - "got_tc_stdout_line(first stdout line for 1st test)", - "got_tc_stderr_line(first stderr line for 1st test)", - "got_tc_stdout_line(second stdout line for 1st test)", - "got_tc_stderr_line(second stderr line for 1st test)", - "got_tc_end(passed)", - "got_tc_start(second-test)", - "got_tc_stdout_line(first stdout line for 2nd test)", - "got_tc_stderr_line(first stderr line for 2nd test)", - "got_tc_stdout_line(second stdout line for 2nd test)", - "got_tc_stderr_line(second stderr line for 2nd test)", - "got_tc_end(skipped, Testing skipped reason)", - "got_tc_start(third.test)", - "got_tc_stdout_line(first stdout line for 3rd test)", - "got_tc_stderr_line(first stderr line for 3rd test)", - "got_tc_stdout_line(second stdout line for 3rd test)", - "got_tc_stderr_line(second stderr line for 3rd test)", - "got_tc_end(failed, Testing failed reason)", - "got_tp_end(This program failed)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_4); -ATF_TEST_CASE_BODY(tps_4) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info: a, foo\n" - "info: b, bar\n" - "info: c, baz\n" - "tps-count: 2\n" - "tp-start: 234.1, first-prog, 3\n" - "tc-start: 234.12, first-test\n" - "tc-end: 234.23, first-test, passed\n" - "tc-start: 234.34, second-test\n" - "tc-end: 234.45, second-test, skipped, Testing skipped reason\n" - "tc-start: 234.56, third-test\n" - "tc-end: 234.67, third-test, failed, Testing failed reason\n" - "tp-end: 234.78, first-prog\n" - "tp-start: 234.89, second-prog, 3\n" - "tc-start: 234.90, first-test\n" - "tc-so:first stdout line for 1st test\n" - "tc-se:first stderr line for 1st test\n" - "tc-so:second stdout line for 1st test\n" - "tc-se:second stderr line for 1st test\n" - "tc-end: 234.101, first-test, passed\n" - "tc-start: 234.112, second-test\n" - "tc-so:first stdout line for 2nd test\n" - "tc-se:first stderr line for 2nd test\n" - "tc-so:second stdout line for 2nd test\n" - "tc-se:second stderr line for 2nd test\n" - "tc-end: 234.123, second-test, skipped, Testing skipped reason\n" - "tc-start: 234.134, third-test\n" - "tc-so:first stdout line for 3rd test\n" - "tc-se:first stderr line for 3rd test\n" - "tc-so:second stdout line for 3rd test\n" - "tc-se:second stderr line for 3rd test\n" - "tc-end: 234.145, third-test, failed, Testing failed reason\n" - "tp-end: 234.156, second-prog, This program failed\n" - "info: d, foo\n" - "info: e, bar\n" - "info: f, baz\n" - ; - - const char* exp_calls[] = { - "got_info(a, foo)", - "got_info(b, bar)", - "got_info(c, baz)", - "got_ntps(2)", - "got_tp_start(first-prog, 3)", - "got_tc_start(first-test)", - "got_tc_end(passed)", - "got_tc_start(second-test)", - "got_tc_end(skipped, Testing skipped reason)", - "got_tc_start(third-test)", - "got_tc_end(failed, Testing failed reason)", - "got_tp_end()", - "got_tp_start(second-prog, 3)", - "got_tc_start(first-test)", - "got_tc_stdout_line(first stdout line for 1st test)", - "got_tc_stderr_line(first stderr line for 1st test)", - "got_tc_stdout_line(second stdout line for 1st test)", - "got_tc_stderr_line(second stderr line for 1st test)", - "got_tc_end(passed)", - "got_tc_start(second-test)", - "got_tc_stdout_line(first stdout line for 2nd test)", - "got_tc_stderr_line(first stderr line for 2nd test)", - "got_tc_stdout_line(second stdout line for 2nd test)", - "got_tc_stderr_line(second stderr line for 2nd test)", - "got_tc_end(skipped, Testing skipped reason)", - "got_tc_start(third-test)", - "got_tc_stdout_line(first stdout line for 3rd test)", - "got_tc_stderr_line(first stderr line for 3rd test)", - "got_tc_stdout_line(second stdout line for 3rd test)", - "got_tc_stderr_line(second stderr line for 3rd test)", - "got_tc_end(failed, Testing failed reason)", - "got_tp_end(This program failed)", - "got_info(d, foo)", - "got_info(e, bar)", - "got_info(f, baz)", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_5); -ATF_TEST_CASE_BODY(tps_5) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 1\n" - "tp-start: 345.123, the-prog, 1\n" - "tc-start: 345.134, the-test\n" - "tc-so:--- a 2007-11-04 14:00:41.000000000 +0100\n" - "tc-so:+++ b 2007-11-04 14:00:48.000000000 +0100\n" - "tc-so:@@ -1,7 +1,7 @@\n" - "tc-so: This test is meant to simulate a diff.\n" - "tc-so: Blank space at beginning of context lines must be preserved.\n" - "tc-so: \n" - "tc-so:-First original line.\n" - "tc-so:-Second original line.\n" - "tc-so:+First modified line.\n" - "tc-so:+Second modified line.\n" - "tc-so: \n" - "tc-so: EOF\n" - "tc-end: 345.145, the-test, passed\n" - "tp-end: 345.156, the-prog\n" - ; - - // NO_CHECK_STYLE_BEGIN - const char* exp_calls[] = { - "got_ntps(1)", - "got_tp_start(the-prog, 1)", - "got_tc_start(the-test)", - "got_tc_stdout_line(--- a 2007-11-04 14:00:41.000000000 +0100)", - "got_tc_stdout_line(+++ b 2007-11-04 14:00:48.000000000 +0100)", - "got_tc_stdout_line(@@ -1,7 +1,7 @@)", - "got_tc_stdout_line( This test is meant to simulate a diff.)", - "got_tc_stdout_line( Blank space at beginning of context lines must be preserved.)", - "got_tc_stdout_line( )", - "got_tc_stdout_line(-First original line.)", - "got_tc_stdout_line(-Second original line.)", - "got_tc_stdout_line(+First modified line.)", - "got_tc_stdout_line(+Second modified line.)", - "got_tc_stdout_line( )", - "got_tc_stdout_line( EOF)", - "got_tc_end(passed)", - "got_tp_end()", - "got_eof()", - NULL - }; - // NO_CHECK_STYLE_END - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_6); -ATF_TEST_CASE_BODY(tps_6) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 1\n" - "tp-start: 321.1, the-prog, 8\n" - "tc-start: 321.12, one\n" - "tc-end: 321.23, one, expected_death, The reason\n" - "tc-start: 321.34, two\n" - "tc-end: 321.45, two, expected_exit, This would be an exit\n" - "tc-start: 321.56, three\n" - "tc-end: 321.67, three, expected_failure, And this a failure\n" - "tc-start: 321.78, four\n" - "tc-end: 321.89, four, expected_signal, And this a signal\n" - "tc-start: 321.90, five\n" - "tc-end: 321.101, five, failed, Another reason\n" - "tc-start: 321.112, six\n" - "tc-end: 321.123, six, passed\n" - "tc-start: 321.134, seven\n" - "tc-end: 321.145, seven, skipped, Skipping it\n" - "tc-start: 321.156, eight\n" - "tc-end: 321.167, eight, expected_timeout, Some hang reason\n" - "tp-end: 321.178, the-prog\n" - ; - - // NO_CHECK_STYLE_BEGIN - const char* exp_calls[] = { - "got_ntps(1)", - "got_tp_start(the-prog, 8)", - "got_tc_start(one)", - "got_tc_end(expected_death, The reason)", - "got_tc_start(two)", - "got_tc_end(expected_exit, This would be an exit)", - "got_tc_start(three)", - "got_tc_end(expected_failure, And this a failure)", - "got_tc_start(four)", - "got_tc_end(expected_signal, And this a signal)", - "got_tc_start(five)", - "got_tc_end(failed, Another reason)", - "got_tc_start(six)", - "got_tc_end(passed)", - "got_tc_start(seven)", - "got_tc_end(skipped, Skipping it)", - "got_tc_start(eight)", - "got_tc_end(expected_timeout, Some hang reason)", - "got_tp_end()", - "got_eof()", - NULL - }; - // NO_CHECK_STYLE_END - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - - -ATF_TEST_CASE_WITHOUT_HEAD(tps_50); -ATF_TEST_CASE_BODY(tps_50) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "foo\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `foo'; expected tps-count or info field", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_51); -ATF_TEST_CASE_BODY(tps_51) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected `:'", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_52); -ATF_TEST_CASE_BODY(tps_52) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count:\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected number of test programs", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_53); -ATF_TEST_CASE_BODY(tps_53) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 1\n" - "foo\n" - ; - - const char* exp_calls[] = { - "got_ntps(1)", - NULL - }; - - const char* exp_errors[] = { - "4: Unexpected token `foo'; expected start of test program", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_54); -ATF_TEST_CASE_BODY(tps_54) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 1\n" - "foo\n" - "tp-start\n" - "tp-start:\n" - "tp-start: 123\n" - "tp-start: 123.\n" - "tp-start: 123.456\n" - "tp-start: 123.456,\n" - "tp-start: 123.456, foo\n" - "tp-start: 123.456, foo,\n" - "tp-start: 123.456, foo, 0\n" - "bar\n" - "tp-start: 456.789, foo, 0\n" - "tp-end\n" - "tp-start: 777.777, foo, 0\n" - "tp-end:\n" - "tp-start: 777.777, foo, 0\n" - "tp-end: 777\n" - "tp-start: 777.777, foo, 0\n" - "tp-end: 777.\n" - "tp-start: 777.777, foo, 0\n" - "tp-end: 777.888\n" - "tp-start: 777.777, foo, 0\n" - "tp-end: 777.888, \n" - "tp-start: 777.777, foo, 0\n" - "tp-end: 777.888, bar\n" - "tp-start: 777.777, foo, 0\n" - "tp-end: 777.888, foo,\n" - ; - - const char* exp_calls[] = { - "got_ntps(1)", - NULL - }; - - const char* exp_errors[] = { - "4: Unexpected token `foo'; expected start of test program", - "5: Unexpected token `<>'; expected `:'", - "6: Unexpected token `<>'; expected timestamp", - "7: Malformed timestamp value 123", - "8: Malformed timestamp value 123.", - "9: Unexpected token `<>'; expected `,'", - "10: Unexpected token `<>'; expected test program name", - "11: Unexpected token `<>'; expected `,'", - "12: Unexpected token `<>'; expected number of test programs", - "14: Unexpected token `bar'; expected end of test program", - "16: Unexpected token `<>'; expected `:'", - "18: Unexpected token `<>'; expected timestamp", - "20: Malformed timestamp value 777", - "22: Malformed timestamp value 777.", - "24: Unexpected token `<>'; expected `,'", - - "26: Unexpected token `<>'; expected test program name", - "28: Test program name used in terminator does not match opening", - "30: Empty reason for failed test program", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_55); -ATF_TEST_CASE_BODY(tps_55) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 1\n" - "tp-start: 100.200, foo, 1\n" - "foo\n" - "tc-start\n" - "tc-start:\n" - "tc-start: 111\n" - "tc-start: 111.\n" - "tc-start: 111.222\n" - "tc-start: 111.222,\n" - "tc-start: 111.222, foo\n" - "bar\n" - "tc-start: 111.333, foo\n" - "tc-end\n" - "tc-start: 111.444, foo\n" - "tc-end:\n" - "tc-start: 111.444, foo\n" - "tc-end: 111\n" - "tc-start: 111.444, foo\n" - "tc-end: 111.\n" - "tc-start: 111.444, foo\n" - "tc-end: 111.555\n" - "tc-start: 111.444, foo\n" - "tc-end: 111.555, \n" - "tc-start: 111.444, foo\n" - "tc-end: 111.555, bar\n" - "tc-start: 111.444, foo\n" - "tc-end: 111.555, foo\n" - "tc-start: 111.444, foo\n" - "tc-end: 111.555, foo,\n" - "tp-end: 111.666, foo\n" - ; - - const char* exp_calls[] = { - "got_ntps(1)", - "got_tp_start(foo, 1)", - NULL - }; - - // NO_CHECK_STYLE_BEGIN - const char* exp_errors[] = { - "5: Unexpected token `foo'; expected start of test case", - "6: Unexpected token `<>'; expected `:'", - "7: Unexpected token `<>'; expected timestamp", - "8: Malformed timestamp value 111", - "9: Malformed timestamp value 111.", - "10: Unexpected token `<>'; expected `,'", - "11: Unexpected token `<>'; expected test case name", - "13: Unexpected token `bar'; expected end of test case or test case's stdout/stderr line", - "15: Unexpected token `<>'; expected `:'", - "17: Unexpected token `<>'; expected timestamp", - "19: Malformed timestamp value 111", - "21: Malformed timestamp value 111.", - "23: Unexpected token `<>'; expected `,'", - "25: Unexpected token `<>'; expected test case name", - "27: Test case name used in terminator does not match opening", - "29: Unexpected token `<>'; expected `,'", - "31: Unexpected token `<>'; expected expected_{death,exit,failure,signal,timeout}, failed, passed or skipped", - "32: Unexpected token `tp-end'; expected start of test case", - NULL - }; - // NO_CHECK_STYLE_END - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_56); -ATF_TEST_CASE_BODY(tps_56) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 1\n" - "tp-start: 111.222, foo, 1\n" - "tc-start: 111.333, foo\n" - "tc-end: 111.444, foo, passe\n" - "tc-start: 111.333, foo\n" - "tc-end: 111.444, foo, passed,\n" - "tc-start: 111.555, bar\n" - "tc-end: 111.666, bar, failed\n" - "tc-start: 111.555, bar\n" - "tc-end: 111.666, bar, failed,\n" - "tc-start: 111.555, baz\n" - "tc-end: 111.666, baz, skipped\n" - "tc-start: 111.555, baz\n" - "tc-end: 111.666, baz, skipped,\n" - "tp-end: 111.777, foo\n" - ; - - const char* exp_calls[] = { - "got_ntps(1)", - "got_tp_start(foo, 1)", - "got_tc_start(foo)", - NULL - }; - - // NO_CHECK_STYLE_BEGIN - const char* exp_errors[] = { - "6: Unexpected token `passe'; expected expected_{death,exit,failure,signal,timeout}, failed, passed or skipped", - "8: Unexpected token `,'; expected new line", - "10: Unexpected token `<>'; expected `,'", - "12: Empty reason for failed test case result", - "14: Unexpected token `<>'; expected `,'", - "16: Empty reason for skipped test case result", - "17: Unexpected token `tp-end'; expected start of test case", - NULL - }; - // NO_CHECK_STYLE_END - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_57); -ATF_TEST_CASE_BODY(tps_57) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 2\n" - "tp-start: 111.222, foo, 0\n" - "tp-end: 111.333, foo\n" - ; - - const char* exp_calls[] = { - "got_ntps(2)", - "got_tp_start(foo, 0)", - "got_tp_end()", - NULL - }; - - const char* exp_errors[] = { - "6: Unexpected token `<>'; expected start of test program", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_58); -ATF_TEST_CASE_BODY(tps_58) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "tps-count: 1\n" - "tp-start: 111.222, foo, 0\n" - "tp-end: 111.333, foo\n" - "tp-start: 111.444, bar, 0\n" - "tp-end: 111.555, bar\n" - ; - - const char* exp_calls[] = { - "got_ntps(1)", - "got_tp_start(foo, 0)", - "got_tp_end()", - NULL - }; - - const char* exp_errors[] = { - "6: Unexpected token `tp-start'; expected end of stream or info field", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_59); -ATF_TEST_CASE_BODY(tps_59) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected `:'", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_60); -ATF_TEST_CASE_BODY(tps_60) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info:\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected info property name", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_61); -ATF_TEST_CASE_BODY(tps_61) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info: a\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected `,'", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_62); -ATF_TEST_CASE_BODY(tps_62) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info: a,\n" - ; - - const char* exp_calls[] = { - "got_info(a, )", - NULL - }; - - const char* exp_errors[] = { - "4: Unexpected token `<>'; expected tps-count or info field", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_63); -ATF_TEST_CASE_BODY(tps_63) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info: a, b\n" - ; - - const char* exp_calls[] = { - "got_info(a, b)", - NULL - }; - - const char* exp_errors[] = { - "4: Unexpected token `<>'; expected tps-count or info field", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_64); -ATF_TEST_CASE_BODY(tps_64) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info: a, b\n" - "info: a.b.c.def, g\n" - "tps-count\n" - ; - - const char* exp_calls[] = { - "got_info(a, b)", - "got_info(a.b.c.def, g)", - NULL - }; - - const char* exp_errors[] = { - "5: Unexpected token `<>'; expected `:'", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_65); -ATF_TEST_CASE_BODY(tps_65) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info: a, b\n" - "tps-count:\n" - ; - - const char* exp_calls[] = { - "got_info(a, b)", - NULL - }; - - const char* exp_errors[] = { - "4: Unexpected token `<>'; expected number of test programs", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tps_66); -ATF_TEST_CASE_BODY(tps_66) -{ - const char* input = - "Content-Type: application/X-atf-tps; version=\"3\"\n" - "\n" - "info: a, b\n" - "tps-count: 0\n" - "info\n" - ; - - const char* exp_calls[] = { - "got_info(a, b)", - "got_ntps(0)", - NULL - }; - - const char* exp_errors[] = { - "5: Unexpected token `<>'; expected `:'", - NULL - }; - - do_parser_test< tps_reader >(input, exp_calls, exp_errors); -} - -ATF_INIT_TEST_CASES(tcs) -{ - ATF_ADD_TEST_CASE(tcs, tps_1); - ATF_ADD_TEST_CASE(tcs, tps_2); - ATF_ADD_TEST_CASE(tcs, tps_3); - ATF_ADD_TEST_CASE(tcs, tps_4); - ATF_ADD_TEST_CASE(tcs, tps_5); - ATF_ADD_TEST_CASE(tcs, tps_6); - ATF_ADD_TEST_CASE(tcs, tps_50); - ATF_ADD_TEST_CASE(tcs, tps_51); - ATF_ADD_TEST_CASE(tcs, tps_52); - ATF_ADD_TEST_CASE(tcs, tps_53); - ATF_ADD_TEST_CASE(tcs, tps_54); - ATF_ADD_TEST_CASE(tcs, tps_55); - ATF_ADD_TEST_CASE(tcs, tps_56); - ATF_ADD_TEST_CASE(tcs, tps_57); - ATF_ADD_TEST_CASE(tcs, tps_58); - ATF_ADD_TEST_CASE(tcs, tps_59); - ATF_ADD_TEST_CASE(tcs, tps_60); - ATF_ADD_TEST_CASE(tcs, tps_61); - ATF_ADD_TEST_CASE(tcs, tps_62); - ATF_ADD_TEST_CASE(tcs, tps_63); - ATF_ADD_TEST_CASE(tcs, tps_64); - ATF_ADD_TEST_CASE(tcs, tps_65); - ATF_ADD_TEST_CASE(tcs, tps_66); -} - diff --git a/tools/requirements.cpp b/tools/requirements.cpp deleted file mode 100644 index 97fcdc8b5e8c..000000000000 --- a/tools/requirements.cpp +++ /dev/null @@ -1,325 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include -} - -#include -#include -#include -#include -#include - -#include "config.hpp" -#include "defs.hpp" -#include "env.hpp" -#include "fs.hpp" -#include "requirements.hpp" -#include "text.hpp" -#include "user.hpp" - -namespace impl = tools; - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -static -bool -has_program(const tools::fs::path& program) -{ - bool found = false; - - if (program.is_absolute()) { - found = tools::fs::is_executable(program); - } else { - if (program.str().find('/') != std::string::npos) - throw std::runtime_error("Relative paths are not allowed " - "when searching for a program (" + - program.str() + ")"); - - const std::vector< std::string > dirs = tools::text::split( - tools::env::get("PATH"), ":"); - for (std::vector< std::string >::const_iterator iter = dirs.begin(); - !found && iter != dirs.end(); iter++) { - const tools::fs::path& p = tools::fs::path(*iter) / program; - if (tools::fs::is_executable(p)) - found = true; - } - } - - return found; -} - -static -std::string -check_arch(const std::string& arches) -{ - const std::vector< std::string > v = tools::text::split(arches, " "); - - for (std::vector< std::string >::const_iterator iter = v.begin(); - iter != v.end(); iter++) { - if ((*iter) == tools::config::get("atf_arch")) - return ""; - } - - if (v.size() == 1) - return "Requires the '" + arches + "' architecture"; - else - return "Requires one of the '" + arches + "' architectures"; -} - -static -std::string -check_config(const std::string& variables, const vars_map& config) -{ - const std::vector< std::string > v = tools::text::split(variables, " "); - for (std::vector< std::string >::const_iterator iter = v.begin(); - iter != v.end(); iter++) { - if (config.find((*iter)) == config.end()) - return "Required configuration variable '" + (*iter) + "' not " - "defined"; - } - return ""; -} - -static -std::string -check_files(const std::string& progs) -{ - const std::vector< std::string > v = tools::text::split(progs, " "); - for (std::vector< std::string >::const_iterator iter = v.begin(); - iter != v.end(); iter++) { - const tools::fs::path file(*iter); - if (!file.is_absolute()) - throw std::runtime_error("Relative paths are not allowed when " - "checking for a required file (" + file.str() + ")"); - if (!tools::fs::exists(file)) - return "Required file '" + file.str() + "' not found"; - } - return ""; -} - -static -std::string -check_machine(const std::string& machines) -{ - const std::vector< std::string > v = tools::text::split(machines, " "); - - for (std::vector< std::string >::const_iterator iter = v.begin(); - iter != v.end(); iter++) { - if ((*iter) == tools::config::get("atf_machine")) - return ""; - } - - if (v.size() == 1) - return "Requires the '" + machines + "' machine type"; - else - 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) -{ - int64_t available; - std::size_t available_length = sizeof(available); - if (::sysctlbyname(sysctl_variable, &available, &available_length, - NULL, 0) == -1) { - const char* e = std::strerror(errno); - return "Failed to get sysctl(hw.usermem64) value: " + std::string(e); - } - - if (available < needed) { - return "Not enough memory; needed " + tools::text::to_string(needed) + - ", available " + tools::text::to_string(available); - } 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 "Conditional error" -# endif -#else -static -std::string -check_memory_unknown(const int64_t needed ATF_DEFS_ATTRIBUTE_UNUSED) -{ - return ""; -} -#endif - -static -std::string -check_memory(const std::string& raw_memory) -{ - const int64_t needed = tools::text::to_bytes(raw_memory); - -#if defined(__APPLE__) - return check_memory_darwin(needed); -#elif defined(__FreeBSD__) - return check_memory_freebsd(needed); -#elif defined(__NetBSD__) - return check_memory_netbsd(needed); -#else - return check_memory_unknown(needed); -#endif -} - -static -std::string -check_progs(const std::string& progs) -{ - const std::vector< std::string > v = tools::text::split(progs, " "); - for (std::vector< std::string >::const_iterator iter = v.begin(); - iter != v.end(); iter++) { - if (!has_program(tools::fs::path(*iter))) - return "Required program '" + (*iter) + "' not found in the PATH"; - } - return ""; -} - -static -std::string -check_user(const std::string& user, const vars_map& config) -{ - if (user == "root") { - if (!tools::user::is_root()) - return "Requires root privileges"; - else - return ""; - } else if (user == "unprivileged") { - if (tools::user::is_root()) { - const vars_map::const_iterator iter = config.find( - "unprivileged-user"); - if (iter == config.end()) - return "Requires an unprivileged user and the " - "'unprivileged-user' configuration variable is not set"; - else { - const std::string& unprivileged_user = (*iter).second; - try { - (void)tools::user::get_user_ids(unprivileged_user); - return ""; - } catch (const std::runtime_error& e) { - return "Failed to get information for user " + - unprivileged_user; - } - } - } else - return ""; - } else - throw std::runtime_error("Invalid value '" + user + "' for property " - "require.user"); -} - -} // anonymous namespace - -std::string -impl::check_requirements(const vars_map& metadata, - const vars_map& config) -{ - std::string failure_reason = ""; - - for (vars_map::const_iterator iter = metadata.begin(); - failure_reason.empty() && iter != metadata.end(); iter++) { - const std::string& name = (*iter).first; - const std::string& value = (*iter).second; - assert(!value.empty()); // Enforced by application/X-atf-tp parser. - - if (name == "require.arch") - failure_reason = check_arch(value); - else if (name == "require.config") - failure_reason = check_config(value, config); - else if (name == "require.files") - failure_reason = check_files(value); - else if (name == "require.machine") - failure_reason = check_machine(value); - else if (name == "require.memory") - failure_reason = check_memory(value); - else if (name == "require.progs") - failure_reason = check_progs(value); - else if (name == "require.user") - failure_reason = check_user(value, config); - else { - // Unknown require.* properties are forbidden by the - // application/X-atf-tp parser. - assert(failure_reason.find("require.") != 0); - } - } - - return failure_reason; -} - -std::pair< int, int > -impl::get_required_user(const vars_map& metadata, - const vars_map& config) -{ - const vars_map::const_iterator user = metadata.find( - "require.user"); - if (user == metadata.end()) - return std::make_pair(-1, -1); - - if ((*user).second == "unprivileged") { - if (tools::user::is_root()) { - const vars_map::const_iterator iter = config.find( - "unprivileged-user"); - try { - return tools::user::get_user_ids((*iter).second); - } catch (const std::exception& e) { - std::abort(); // This has been validated by check_user. - } - } else { - return std::make_pair(-1, -1); - } - } else - return std::make_pair(-1, -1); -} diff --git a/tools/requirements.hpp b/tools/requirements.hpp deleted file mode 100644 index 1eefdaf555e5..000000000000 --- a/tools/requirements.hpp +++ /dev/null @@ -1,47 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_REQUIREMENTS_HPP) -#define TOOLS_REQUIREMENTS_HPP - -#include -#include -#include - -namespace tools { - -std::string check_requirements(const std::map< std::string, std::string >&, - const std::map< std::string, std::string >&); -std::pair< int, int > get_required_user( - const std::map< std::string, std::string >&, - const std::map< std::string, std::string >&); - -} // namespace tools - -#endif // !defined(TOOLS_REQUIREMENTS_HPP) diff --git a/tools/requirements_test.cpp b/tools/requirements_test.cpp deleted file mode 100644 index 6d37d758cb45..000000000000 --- a/tools/requirements_test.cpp +++ /dev/null @@ -1,400 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include - -#include "config.hpp" -#include "requirements.hpp" -#include "text.hpp" -#include "user.hpp" - -namespace impl = tools; - -// ------------------------------------------------------------------------- -// Auxiliary functions. -// ------------------------------------------------------------------------- - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -const vars_map no_config; - -void -do_check(const std::string& expected, const vars_map& metadata, - const vars_map& config = no_config) -{ - const std::string actual = impl::check_requirements(metadata, config); - if (!tools::text::match(actual, expected)) - ATF_FAIL("Requirements failure reason \"" + actual + "\" does not " - "match \"" + expected + "\""); -} - -} // anonymous namespace - -// ------------------------------------------------------------------------- -// Tests for the require.arch metadata property. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE(require_arch_one_ok); -ATF_TEST_CASE_HEAD(require_arch_one_ok) {} -ATF_TEST_CASE_BODY(require_arch_one_ok) { - vars_map metadata; - metadata["require.arch"] = tools::config::get("atf_arch"); - do_check("", metadata); -} - -ATF_TEST_CASE(require_arch_one_fail); -ATF_TEST_CASE_HEAD(require_arch_one_fail) {} -ATF_TEST_CASE_BODY(require_arch_one_fail) { - vars_map metadata; - metadata["require.arch"] = "__fake_arch__"; - do_check("Requires the '__fake_arch__' architecture", metadata); -} - -ATF_TEST_CASE(require_arch_many_ok); -ATF_TEST_CASE_HEAD(require_arch_many_ok) {} -ATF_TEST_CASE_BODY(require_arch_many_ok) { - vars_map metadata; - metadata["require.arch"] = "__foo__ " + tools::config::get("atf_arch") + - " __bar__"; - do_check("", metadata); -} - -ATF_TEST_CASE(require_arch_many_fail); -ATF_TEST_CASE_HEAD(require_arch_many_fail) {} -ATF_TEST_CASE_BODY(require_arch_many_fail) { - vars_map metadata; - metadata["require.arch"] = "__foo__ __bar__ __baz__"; - do_check("Requires one of the '__foo__ __bar__ __baz__' architectures", - metadata); -} - -// ------------------------------------------------------------------------- -// Tests for the require.config metadata property. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE(require_config_one_ok); -ATF_TEST_CASE_HEAD(require_config_one_ok) {} -ATF_TEST_CASE_BODY(require_config_one_ok) { - vars_map metadata, config; - metadata["require.config"] = "var1"; - config["var1"] = "some-value"; - do_check("", metadata, config); -} - -ATF_TEST_CASE(require_config_one_fail); -ATF_TEST_CASE_HEAD(require_config_one_fail) {} -ATF_TEST_CASE_BODY(require_config_one_fail) { - vars_map metadata, config; - metadata["require.config"] = "var1"; - do_check("Required configuration variable 'var1' not defined", metadata, - config); -} - -ATF_TEST_CASE(require_config_many_ok); -ATF_TEST_CASE_HEAD(require_config_many_ok) {} -ATF_TEST_CASE_BODY(require_config_many_ok) { - vars_map metadata, config; - metadata["require.config"] = "var1 var2 var3"; - config["var1"] = "first-value"; - config["var2"] = "second-value"; - config["var3"] = "third-value"; - do_check("", metadata, config); -} - -ATF_TEST_CASE(require_config_many_fail); -ATF_TEST_CASE_HEAD(require_config_many_fail) {} -ATF_TEST_CASE_BODY(require_config_many_fail) { - vars_map metadata, config; - metadata["require.config"] = "var1 var2 var3"; - config["var1"] = "first-value"; - config["var3"] = "third-value"; - do_check("Required configuration variable 'var2' not defined", metadata, - config); -} - -// ------------------------------------------------------------------------- -// Tests for the require.files metadata property. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_ok); -ATF_TEST_CASE_BODY(require_files_one_ok) { - vars_map metadata; - metadata["require.files"] = "/bin/ls"; - do_check("", metadata); -} - -ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_missing); -ATF_TEST_CASE_BODY(require_files_one_missing) { - vars_map metadata; - metadata["require.files"] = "/non-existent/foo"; - do_check("Required file '/non-existent/foo' not found", metadata); -} - -ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_fail); -ATF_TEST_CASE_BODY(require_files_one_fail) { - vars_map metadata; - metadata["require.files"] = "/bin/cp this-is-relative"; - ATF_REQUIRE_THROW_RE(std::runtime_error, "Relative.*(this-is-relative)", - impl::check_requirements(metadata, no_config)); -} - -ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_ok); -ATF_TEST_CASE_BODY(require_files_many_ok) { - vars_map metadata; - metadata["require.files"] = "/bin/ls /bin/cp"; - do_check("", metadata); -} - -ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_missing); -ATF_TEST_CASE_BODY(require_files_many_missing) { - vars_map metadata; - metadata["require.files"] = "/bin/ls /non-existent/bar /bin/cp"; - do_check("Required file '/non-existent/bar' not found", metadata); -} - -ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_fail); -ATF_TEST_CASE_BODY(require_files_many_fail) { - vars_map metadata; - metadata["require.files"] = "/bin/cp also-relative"; - ATF_REQUIRE_THROW_RE(std::runtime_error, "Relative.*(also-relative)", - impl::check_requirements(metadata, no_config)); -} - -// ------------------------------------------------------------------------- -// Tests for the require.machine metadata property. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE(require_machine_one_ok); -ATF_TEST_CASE_HEAD(require_machine_one_ok) {} -ATF_TEST_CASE_BODY(require_machine_one_ok) { - vars_map metadata; - metadata["require.machine"] = tools::config::get("atf_machine"); - do_check("", metadata); -} - -ATF_TEST_CASE(require_machine_one_fail); -ATF_TEST_CASE_HEAD(require_machine_one_fail) {} -ATF_TEST_CASE_BODY(require_machine_one_fail) { - vars_map metadata; - metadata["require.machine"] = "__fake_machine__"; - do_check("Requires the '__fake_machine__' machine type", metadata); -} - -ATF_TEST_CASE(require_machine_many_ok); -ATF_TEST_CASE_HEAD(require_machine_many_ok) {} -ATF_TEST_CASE_BODY(require_machine_many_ok) { - vars_map metadata; - metadata["require.machine"] = "__foo__ " + - tools::config::get("atf_machine") + " __bar__"; - do_check("", metadata); -} - -ATF_TEST_CASE(require_machine_many_fail); -ATF_TEST_CASE_HEAD(require_machine_many_fail) {} -ATF_TEST_CASE_BODY(require_machine_many_fail) { - vars_map metadata; - metadata["require.machine"] = "__foo__ __bar__ __baz__"; - do_check("Requires one of the '__foo__ __bar__ __baz__' machine types", - metadata); -} - -// ------------------------------------------------------------------------- -// Tests for the require.memory metadata property. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE_WITHOUT_HEAD(require_memory_ok); -ATF_TEST_CASE_BODY(require_memory_ok) { - vars_map metadata; - metadata["require.memory"] = "1m"; - do_check("", metadata); -} - -ATF_TEST_CASE_WITHOUT_HEAD(require_memory_not_enough); -ATF_TEST_CASE_BODY(require_memory_not_enough) { - vars_map metadata; - metadata["require.memory"] = "128t"; -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) - do_check("Not enough memory; needed 140737488355328, available [0-9]*", - metadata); -#else - skip("Don't know how to check for the amount of physical memory"); -#endif -} - -ATF_TEST_CASE_WITHOUT_HEAD(require_memory_fail); -ATF_TEST_CASE_BODY(require_memory_fail) { - vars_map metadata; - metadata["require.memory"] = "foo"; - ATF_REQUIRE_THROW(std::runtime_error, - impl::check_requirements(metadata, no_config)); -} - -// ------------------------------------------------------------------------- -// Tests for the require.progs metadata property. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE(require_progs_one_ok); -ATF_TEST_CASE_HEAD(require_progs_one_ok) {} -ATF_TEST_CASE_BODY(require_progs_one_ok) { - vars_map metadata; - metadata["require.progs"] = "cp"; - do_check("", metadata); -} - -ATF_TEST_CASE(require_progs_one_missing); -ATF_TEST_CASE_HEAD(require_progs_one_missing) {} -ATF_TEST_CASE_BODY(require_progs_one_missing) { - vars_map metadata; - metadata["require.progs"] = "cp __non-existent__"; - do_check("Required program '__non-existent__' not found in the PATH", - metadata); -} - -ATF_TEST_CASE(require_progs_one_fail); -ATF_TEST_CASE_HEAD(require_progs_one_fail) {} -ATF_TEST_CASE_BODY(require_progs_one_fail) { - vars_map metadata; - metadata["require.progs"] = "bin/cp"; - ATF_REQUIRE_THROW(std::runtime_error, - impl::check_requirements(metadata, no_config)); -} - -ATF_TEST_CASE(require_progs_many_ok); -ATF_TEST_CASE_HEAD(require_progs_many_ok) {} -ATF_TEST_CASE_BODY(require_progs_many_ok) { - vars_map metadata; - metadata["require.progs"] = "cp ls mv"; - do_check("", metadata); -} - -ATF_TEST_CASE(require_progs_many_missing); -ATF_TEST_CASE_HEAD(require_progs_many_missing) {} -ATF_TEST_CASE_BODY(require_progs_many_missing) { - vars_map metadata; - metadata["require.progs"] = "mv ls __foo__ cp"; - do_check("Required program '__foo__' not found in the PATH", metadata); -} - -ATF_TEST_CASE(require_progs_many_fail); -ATF_TEST_CASE_HEAD(require_progs_many_fail) {} -ATF_TEST_CASE_BODY(require_progs_many_fail) { - vars_map metadata; - metadata["require.progs"] = "ls cp ../bin/cp"; - ATF_REQUIRE_THROW(std::runtime_error, - impl::check_requirements(metadata, no_config)); -} - -// ------------------------------------------------------------------------- -// Tests for the require.user metadata property. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE(require_user_root); -ATF_TEST_CASE_HEAD(require_user_root) {} -ATF_TEST_CASE_BODY(require_user_root) { - vars_map metadata; - metadata["require.user"] = "root"; - if (tools::user::is_root()) - do_check("", metadata); - else - do_check("Requires root privileges", metadata); -} - -ATF_TEST_CASE(require_user_unprivileged); -ATF_TEST_CASE_HEAD(require_user_unprivileged) {} -ATF_TEST_CASE_BODY(require_user_unprivileged) { - vars_map metadata; - metadata["require.user"] = "unprivileged"; - if (tools::user::is_root()) - do_check("Requires an unprivileged user and the 'unprivileged-user' " - "configuration variable is not set", metadata); - else - do_check("", metadata); -} - -ATF_TEST_CASE(require_user_fail); -ATF_TEST_CASE_HEAD(require_user_fail) {} -ATF_TEST_CASE_BODY(require_user_fail) { - vars_map metadata; - metadata["require.user"] = "nobody"; - ATF_REQUIRE_THROW(std::runtime_error, - impl::check_requirements(metadata, no_config)); -} - -// ------------------------------------------------------------------------- -// Main. -// ------------------------------------------------------------------------- - -ATF_INIT_TEST_CASES(tcs) -{ - // Add test cases for require.arch. - ATF_ADD_TEST_CASE(tcs, require_arch_one_ok); - ATF_ADD_TEST_CASE(tcs, require_arch_one_fail); - ATF_ADD_TEST_CASE(tcs, require_arch_many_ok); - ATF_ADD_TEST_CASE(tcs, require_arch_many_fail); - - // Add test cases for require.config. - ATF_ADD_TEST_CASE(tcs, require_config_one_ok); - ATF_ADD_TEST_CASE(tcs, require_config_one_fail); - ATF_ADD_TEST_CASE(tcs, require_config_many_ok); - ATF_ADD_TEST_CASE(tcs, require_config_many_fail); - - // Add test cases for require.files. - ATF_ADD_TEST_CASE(tcs, require_files_one_ok); - ATF_ADD_TEST_CASE(tcs, require_files_one_missing); - ATF_ADD_TEST_CASE(tcs, require_files_one_fail); - ATF_ADD_TEST_CASE(tcs, require_files_many_ok); - ATF_ADD_TEST_CASE(tcs, require_files_many_missing); - ATF_ADD_TEST_CASE(tcs, require_files_many_fail); - - // Add test cases for require.machine. - ATF_ADD_TEST_CASE(tcs, require_machine_one_ok); - ATF_ADD_TEST_CASE(tcs, require_machine_one_fail); - ATF_ADD_TEST_CASE(tcs, require_machine_many_ok); - ATF_ADD_TEST_CASE(tcs, require_machine_many_fail); - - // Add test cases for require.memory. - ATF_ADD_TEST_CASE(tcs, require_memory_ok); - ATF_ADD_TEST_CASE(tcs, require_memory_not_enough); - ATF_ADD_TEST_CASE(tcs, require_memory_fail); - - // Add test cases for require.progs. - ATF_ADD_TEST_CASE(tcs, require_progs_one_ok); - ATF_ADD_TEST_CASE(tcs, require_progs_one_missing); - ATF_ADD_TEST_CASE(tcs, require_progs_one_fail); - ATF_ADD_TEST_CASE(tcs, require_progs_many_ok); - ATF_ADD_TEST_CASE(tcs, require_progs_many_missing); - ATF_ADD_TEST_CASE(tcs, require_progs_many_fail); - - // Add test cases for require.user. - ATF_ADD_TEST_CASE(tcs, require_user_root); - ATF_ADD_TEST_CASE(tcs, require_user_unprivileged); - ATF_ADD_TEST_CASE(tcs, require_user_fail); -} diff --git a/tools/sample/atf-run.hooks b/tools/sample/atf-run.hooks deleted file mode 100644 index 86d187d3de3b..000000000000 --- a/tools/sample/atf-run.hooks +++ /dev/null @@ -1,23 +0,0 @@ -# -# Definition of custom hooks for atf-run. -# -# Uncomment any hooks that you want to override and add your own code -# to them. Some sample calls are included in them. Be very careful -# with what you print from here. -# -# See atf-run(1) for more details. -# - -#info_start_hook() -#{ -# default_info_start_hook "${@}" -# -# atf_tps_writer_info "extra.info" "An example" -#} - -#info_end_hook() -#{ -# default_info_end_hook "${@}" -# -# atf_tps_writer_info "extra.info" "An example" -#} diff --git a/tools/sample/common.conf b/tools/sample/common.conf deleted file mode 100644 index 464ee96d09cd..000000000000 --- a/tools/sample/common.conf +++ /dev/null @@ -1,11 +0,0 @@ -Content-Type: application/X-atf-config; version="1" - -# -# Sample configuration file for properties affecting all test suites. -# - -# 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 = "_atf" diff --git a/tools/several_tcs_helper.c b/tools/several_tcs_helper.c deleted file mode 100644 index d287c8193a67..000000000000 --- a/tools/several_tcs_helper.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Automated Testing Framework (atf) - * - * Copyright (c) 2010 The NetBSD Foundation, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include - -ATF_TC(first); -ATF_TC_HEAD(first, tc) -{ - atf_tc_set_md_var(tc, "descr", "Description 1"); -} -ATF_TC_BODY(first, tc) -{ -} - -ATF_TC_WITH_CLEANUP(second); -ATF_TC_HEAD(second, tc) -{ - atf_tc_set_md_var(tc, "descr", "Description 2"); - atf_tc_set_md_var(tc, "timeout", "500"); - atf_tc_set_md_var(tc, "X-property", "Custom property"); -} -ATF_TC_BODY(second, tc) -{ -} -ATF_TC_CLEANUP(second, tc) -{ -} - -ATF_TC_WITHOUT_HEAD(third); -ATF_TC_BODY(third, tc) -{ -} - -ATF_TP_ADD_TCS(tp) -{ - ATF_TP_ADD_TC(tp, first); - ATF_TP_ADD_TC(tp, second); - ATF_TP_ADD_TC(tp, third); - - return atf_no_error(); -} diff --git a/tools/share/atf-run.hooks b/tools/share/atf-run.hooks deleted file mode 100644 index c94f3bcfc9ec..000000000000 --- a/tools/share/atf-run.hooks +++ /dev/null @@ -1,94 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -atf_tps_writer_info() -{ - class=${1}; shift - echo "info: ${class}, $*" -} - -info_start_hook() -{ - default_info_start_hook "${@}" -} - -default_info_start_hook() -{ - atf_tps_writer_info "atf.version" $(atf-version | head -n 1) - - atf_tps_writer_info "tests.root" $(pwd) - - atf_tps_writer_info "time.start" $(date) - - atf_tps_writer_info "uname.sysname" $(uname -s) - atf_tps_writer_info "uname.nodename" $(uname -n) - atf_tps_writer_info "uname.release" $(uname -r) - atf_tps_writer_info "uname.version" $(uname -v) - atf_tps_writer_info "uname.machine" $(uname -m) - - # Add all the environment variables to the report. We have to be - # careful with those that span over multiple lines; otherwise their - # values could be printed as multiple different variables (one per - # line), which is incorrect. - oldifs="${IFS}" - IFS=' -' - set -- $(env) - val=${1}; shift - while [ ${#} -gt 0 ]; do - if echo "${1}" | grep '^[a-zA-Z0-0_][a-zA-Z0-9_]*=' >/dev/null; then - atf_tps_writer_info "env" "${val}" - val="${1}" - else - val="${val} ${1}" - fi - shift - done - atf_tps_writer_info "env" "${val}" - IFS="${oldifs}" -} - -info_end_hook() -{ - default_info_end_hook "${@}" -} - -default_info_end_hook() -{ - atf_tps_writer_info "time.end" $(date) -} - -sitehooks=$(atf-config -t atf_confdir)/atf-run.hooks -userhooks=${HOME}/.atf/atf-run.hooks -[ -f ${sitehooks} ] && . ${sitehooks} -[ -f ${userhooks} ] && . ${userhooks} - -eval ${1} - -# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 diff --git a/tools/signals.cpp b/tools/signals.cpp deleted file mode 100644 index 0e731de9c827..000000000000 --- a/tools/signals.cpp +++ /dev/null @@ -1,146 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(HAVE_CONFIG_H) -#include "bconfig.h" -#endif - -extern "C" { -#include -#include -} - -#include -#include - -#include "exceptions.hpp" -#include "signals.hpp" - -namespace impl = tools::signals; -#define IMPL_NAME "tools::signals" - -const int impl::last_signo = LAST_SIGNO; - -// ------------------------------------------------------------------------ -// The "signal_holder" class. -// ------------------------------------------------------------------------ - -namespace { - -static bool happened[LAST_SIGNO + 1]; - -static -void -holder_handler(const int signo) -{ - happened[signo] = true; -} - -} // anonymous namespace - -impl::signal_holder::signal_holder(const int signo) : - m_signo(signo), - m_sp(NULL) -{ - happened[signo] = false; - m_sp = new signal_programmer(m_signo, holder_handler); -} - -impl::signal_holder::~signal_holder(void) -{ - if (m_sp != NULL) - delete m_sp; - - if (happened[m_signo]) - ::kill(::getpid(), m_signo); -} - -void -impl::signal_holder::process(void) -{ - if (happened[m_signo]) { - delete m_sp; - m_sp = NULL; - happened[m_signo] = false; - ::kill(::getpid(), m_signo); - m_sp = new signal_programmer(m_signo, holder_handler); - } -} - -// ------------------------------------------------------------------------ -// The "signal_programmer" class. -// ------------------------------------------------------------------------ - -impl::signal_programmer::signal_programmer(const int signo, const handler h) : - m_signo(signo), - m_handler(h), - m_programmed(false) -{ - struct ::sigaction sa; - - sa.sa_handler = m_handler; - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - - if (::sigaction(m_signo, &sa, &m_oldsa) == -1) - throw tools::system_error(IMPL_NAME, "Could not install handler for " - "signal", errno); - m_programmed = true; -} - -impl::signal_programmer::~signal_programmer(void) -{ - unprogram(); -} - -void -impl::signal_programmer::unprogram(void) -{ - if (m_programmed) { - if (::sigaction(m_signo, &m_oldsa, NULL) == -1) - std::abort(); - m_programmed = false; - } -} - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -void -impl::reset(const int signo) -{ - struct ::sigaction sa; - - sa.sa_handler = SIG_DFL; - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - - (void)::sigaction(signo, &sa, NULL); -} diff --git a/tools/signals.hpp b/tools/signals.hpp deleted file mode 100644 index 549a2cad0956..000000000000 --- a/tools/signals.hpp +++ /dev/null @@ -1,92 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_SIGNALS_HPP) -#define TOOLS_SIGNALS_HPP - -extern "C" { -#include -} - -namespace tools { -namespace signals { - -extern const int last_signo; -typedef void (*handler)(const int); - -class signal_programmer; - -// ------------------------------------------------------------------------ -// The "signal_holder" class. -// ------------------------------------------------------------------------ - -// -// A RAII model to hold a signal while the object is alive. -// -class signal_holder { - const int m_signo; - signal_programmer* m_sp; - -public: - signal_holder(const int); - ~signal_holder(void); - - void process(void); -}; - -// ------------------------------------------------------------------------ -// The "signal_programmer" class. -// ------------------------------------------------------------------------ - -// -// A RAII model to program a signal while the object is alive. -// -class signal_programmer { - const int m_signo; - const handler m_handler; - bool m_programmed; - struct sigaction m_oldsa; - -public: - signal_programmer(const int, const handler); - ~signal_programmer(void); - - void unprogram(void); -}; - -// ------------------------------------------------------------------------ -// Free functions. -// ------------------------------------------------------------------------ - -void reset(const int); - -} // namespace signals -} // namespace tools - -#endif // !defined(TOOLS_SIGNALS_HPP) diff --git a/tools/signals_test.cpp b/tools/signals_test.cpp deleted file mode 100644 index aa6a8e5a8ea6..000000000000 --- a/tools/signals_test.cpp +++ /dev/null @@ -1,275 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2008 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include -#include -} - -#include -#include -#include - -#include - -#include "defs.hpp" -#include "exceptions.hpp" -#include "process.hpp" -#include "signals.hpp" - -// ------------------------------------------------------------------------ -// Auxiliary functions. -// ------------------------------------------------------------------------ - -namespace sigusr1 { - static bool happened = false; - - static - void - handler(int signo ATF_DEFS_ATTRIBUTE_UNUSED) - { - happened = true; - } - - static - void - program(void) - { - struct sigaction sa; - sa.sa_handler = handler; - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - if (::sigaction(SIGUSR1, &sa, NULL) == -1) - throw tools::system_error("sigusr1::program", - "sigaction(2) failed", errno); - } -} // namespace sigusr1 - -namespace sigusr1_2 { - static bool happened = false; - - static - void - handler(int signo ATF_DEFS_ATTRIBUTE_UNUSED) - { - happened = true; - } -} // namespace sigusr1_2 - -// ------------------------------------------------------------------------ -// Tests for the "signal_holder" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(signal_holder_preserve); -ATF_TEST_CASE_HEAD(signal_holder_preserve) -{ - set_md_var("descr", "Tests that signal_holder preserves the original " - "signal handler and restores it upon destruction"); -} -ATF_TEST_CASE_BODY(signal_holder_preserve) -{ - using tools::signals::signal_holder; - - sigusr1::program(); - - sigusr1::happened = false; - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(sigusr1::happened); - - { - signal_holder hld(SIGUSR1); - ::kill(::getpid(), SIGUSR1); - } - - sigusr1::happened = false; - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(sigusr1::happened); -} - -ATF_TEST_CASE(signal_holder_destructor); -ATF_TEST_CASE_HEAD(signal_holder_destructor) -{ - set_md_var("descr", "Tests that signal_holder processes a pending " - "signal upon destruction"); -} -ATF_TEST_CASE_BODY(signal_holder_destructor) -{ - using tools::signals::signal_holder; - - sigusr1::program(); - - sigusr1::happened = false; - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(sigusr1::happened); - - { - signal_holder hld(SIGUSR1); - - sigusr1::happened = false; - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(!sigusr1::happened); - } - ATF_REQUIRE(sigusr1::happened); -} - -ATF_TEST_CASE(signal_holder_process); -ATF_TEST_CASE_HEAD(signal_holder_process) -{ - set_md_var("descr", "Tests that signal_holder's process method works " - "to process a delayed signal explicitly"); -} -ATF_TEST_CASE_BODY(signal_holder_process) -{ - using tools::signals::signal_holder; - - sigusr1::program(); - - sigusr1::happened = false; - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(sigusr1::happened); - - { - signal_holder hld(SIGUSR1); - - sigusr1::happened = false; - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(!sigusr1::happened); - - hld.process(); - ATF_REQUIRE(sigusr1::happened); - - sigusr1::happened = false; - } - ATF_REQUIRE(!sigusr1::happened); -} - -// ------------------------------------------------------------------------ -// Tests for the "signal_programmer" class. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(signal_programmer_program); -ATF_TEST_CASE_HEAD(signal_programmer_program) -{ - set_md_var("descr", "Tests that signal_programmer correctly installs a " - "handler"); -} -ATF_TEST_CASE_BODY(signal_programmer_program) -{ - using tools::signals::signal_programmer; - - signal_programmer sp(SIGUSR1, sigusr1_2::handler); - - sigusr1_2::happened = false; - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(sigusr1_2::happened); -} - -ATF_TEST_CASE(signal_programmer_preserve); -ATF_TEST_CASE_HEAD(signal_programmer_preserve) -{ - set_md_var("descr", "Tests that signal_programmer uninstalls the " - "handler during destruction"); -} -ATF_TEST_CASE_BODY(signal_programmer_preserve) -{ - using tools::signals::signal_programmer; - - sigusr1::program(); - sigusr1::happened = false; - - { - signal_programmer sp(SIGUSR1, sigusr1_2::handler); - - sigusr1_2::happened = false; - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(sigusr1_2::happened); - } - - ATF_REQUIRE(!sigusr1::happened); - ::kill(::getpid(), SIGUSR1); - ATF_REQUIRE(sigusr1::happened); -} - -// ------------------------------------------------------------------------ -// Tests cases for the free functions. -// ------------------------------------------------------------------------ - -static -void -reset_child(void *v ATF_DEFS_ATTRIBUTE_UNUSED) -{ - sigusr1::program(); - - sigusr1::happened = false; - tools::signals::reset(SIGUSR1); - kill(::getpid(), SIGUSR1); - - if (sigusr1::happened) { - std::cerr << "Signal was not resetted correctly\n"; - std::abort(); - } else { - std::exit(EXIT_SUCCESS); - } -} - -ATF_TEST_CASE(reset); -ATF_TEST_CASE_HEAD(reset) -{ - set_md_var("descr", "Tests the reset function"); -} -ATF_TEST_CASE_BODY(reset) -{ - tools::process::child c = - tools::process::fork(reset_child, tools::process::stream_inherit(), - tools::process::stream_inherit(), NULL); - - const tools::process::status s = c.wait(); - ATF_REQUIRE(s.exited() || s.signaled()); - ATF_REQUIRE(!s.signaled() || s.termsig() == SIGUSR1); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the tests for the "signal_holder" class. - ATF_ADD_TEST_CASE(tcs, signal_holder_preserve); - ATF_ADD_TEST_CASE(tcs, signal_holder_destructor); - ATF_ADD_TEST_CASE(tcs, signal_holder_process); - - // Add the tests for the "signal_programmer" class. - ATF_ADD_TEST_CASE(tcs, signal_programmer_program); - ATF_ADD_TEST_CASE(tcs, signal_programmer_preserve); - - // Add the test cases for the free functions. - ATF_ADD_TEST_CASE(tcs, reset); -} diff --git a/tools/test-program.cpp b/tools/test-program.cpp deleted file mode 100644 index 91ad78acb497..000000000000 --- a/tools/test-program.cpp +++ /dev/null @@ -1,790 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include -#include - -#include -#include -#include -} - -#include -#include -#include -#include -#include -#include - -#include "config_file.hpp" -#include "defs.hpp" -#include "env.hpp" -#include "fs.hpp" -#include "io.hpp" -#include "parser.hpp" -#include "process.hpp" -#include "requirements.hpp" -#include "signals.hpp" -#include "test-program.hpp" -#include "text.hpp" -#include "timers.hpp" -#include "user.hpp" - -namespace impl = tools::test_program; -namespace detail = tools::test_program::detail; - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -static void -check_stream(std::ostream& os) -{ - // If we receive a signal while writing to the stream, the bad bit gets set. - // Things seem to behave fine afterwards if we clear such error condition. - // However, I'm not sure if it's safe to query errno at this point. - if (os.bad()) { - if (errno == EINTR) - os.clear(); - else - throw std::runtime_error("Failed"); - } -} - -namespace atf_tp { - -static const tools::parser::token_type eof_type = 0; -static const tools::parser::token_type nl_type = 1; -static const tools::parser::token_type text_type = 2; -static const tools::parser::token_type colon_type = 3; -static const tools::parser::token_type dblquote_type = 4; - -class tokenizer : public tools::parser::tokenizer< std::istream > { -public: - tokenizer(std::istream& is, size_t curline) : - tools::parser::tokenizer< std::istream > - (is, true, eof_type, nl_type, text_type, curline) - { - add_delim(':', colon_type); - add_quote('"', dblquote_type); - } -}; - -} // namespace atf_tp - -class metadata_reader : public detail::atf_tp_reader { - impl::test_cases_map m_tcs; - - void got_tc(const std::string& ident, const vars_map& props) - { - if (m_tcs.find(ident) != m_tcs.end()) - throw(std::runtime_error("Duplicate test case " + ident + - " in test program")); - m_tcs[ident] = props; - - if (m_tcs[ident].find("has.cleanup") == m_tcs[ident].end()) - 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", "300")); - } - -public: - metadata_reader(std::istream& is) : - detail::atf_tp_reader(is) - { - } - - const impl::test_cases_map& - get_tcs(void) - const - { - return m_tcs; - } -}; - -struct get_metadata_params { - const tools::fs::path& executable; - const vars_map& config; - - get_metadata_params(const tools::fs::path& p_executable, - const vars_map& p_config) : - executable(p_executable), - config(p_config) - { - } -}; - -struct test_case_params { - const tools::fs::path& executable; - const std::string& test_case_name; - const std::string& test_case_part; - const vars_map& metadata; - const vars_map& config; - const tools::fs::path& resfile; - const tools::fs::path& workdir; - - test_case_params(const tools::fs::path& p_executable, - const std::string& p_test_case_name, - const std::string& p_test_case_part, - const vars_map& p_metadata, - const vars_map& p_config, - const tools::fs::path& p_resfile, - const tools::fs::path& p_workdir) : - executable(p_executable), - test_case_name(p_test_case_name), - test_case_part(p_test_case_part), - metadata(p_metadata), - config(p_config), - resfile(p_resfile), - workdir(p_workdir) - { - } -}; - -static -std::string -generate_timestamp(void) -{ - struct timeval tv; - if (gettimeofday(&tv, NULL) == -1) - return "0.0"; - - char buf[32]; - const int len = snprintf(buf, sizeof(buf), "%ld.%ld", - static_cast< long >(tv.tv_sec), - static_cast< long >(tv.tv_usec)); - if (len >= static_cast< int >(sizeof(buf)) || len < 0) - return "0.0"; - else - return buf; -} - -static -void -append_to_vector(std::vector< std::string >& v1, - const std::vector< std::string >& v2) -{ - std::copy(v2.begin(), v2.end(), - std::back_insert_iterator< std::vector< std::string > >(v1)); -} - -static -char** -vector_to_argv(const std::vector< std::string >& v) -{ - char** argv = new char*[v.size() + 1]; - for (std::vector< std::string >::size_type i = 0; i < v.size(); i++) { - argv[i] = strdup(v[i].c_str()); - } - argv[v.size()] = NULL; - return argv; -} - -static -void -exec_or_exit(const tools::fs::path& executable, - const std::vector< std::string >& argv) -{ - // This leaks memory in case of a failure, but it is OK. Exiting will - // do the necessary cleanup. - char* const* native_argv = vector_to_argv(argv); - - ::execv(executable.c_str(), native_argv); - - const std::string message = "Failed to execute '" + executable.str() + - "': " + std::strerror(errno) + "\n"; - if (::write(STDERR_FILENO, message.c_str(), message.length()) == -1) - std::abort(); - std::exit(EXIT_FAILURE); -} - -static -std::vector< std::string > -config_to_args(const vars_map& config) -{ - std::vector< std::string > args; - - for (vars_map::const_iterator iter = config.begin(); - iter != config.end(); iter++) - args.push_back("-v" + (*iter).first + "=" + (*iter).second); - - return args; -} - -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"); - assert(fd == STDIN_FILENO); -} - -static -void -prepare_child(const tools::fs::path& workdir) -{ - const int ret = ::setpgid(::getpid(), 0); - assert(ret != -1); - - ::umask(S_IWGRP | S_IWOTH); - - for (int i = 1; i <= tools::signals::last_signo; i++) - tools::signals::reset(i); - - tools::env::set("HOME", workdir.str()); - tools::env::unset("LANG"); - tools::env::unset("LC_ALL"); - tools::env::unset("LC_COLLATE"); - tools::env::unset("LC_CTYPE"); - tools::env::unset("LC_MESSAGES"); - tools::env::unset("LC_MONETARY"); - tools::env::unset("LC_NUMERIC"); - tools::env::unset("LC_TIME"); - tools::env::set("TZ", "UTC"); - - tools::env::set("__RUNNING_INSIDE_ATF_RUN", "internal-yes-value"); - - tools::fs::change_directory(workdir); - - silence_stdin(); -} - -static -void -get_metadata_child(void* raw_params) -{ - const get_metadata_params* params = - static_cast< const get_metadata_params* >(raw_params); - - std::vector< std::string > argv; - argv.push_back(params->executable.leaf_name()); - argv.push_back("-l"); - argv.push_back("-s" + params->executable.branch_path().str()); - append_to_vector(argv, config_to_args(params->config)); - - exec_or_exit(params->executable, argv); -} - -void -run_test_case_child(void* raw_params) -{ - const test_case_params* params = - static_cast< const test_case_params* >(raw_params); - - const std::pair< int, int > user = tools::get_required_user( - params->metadata, params->config); - if (user.first != -1 && user.second != -1) - tools::user::drop_privileges(user); - - // The input 'tp' parameter may be relative and become invalid once - // we change the current working directory. - const tools::fs::path absolute_executable = params->executable.to_absolute(); - - // Prepare the test program's arguments. We use dynamic memory and - // do not care to release it. We are going to die anyway very soon, - // either due to exec(2) or to exit(3). - std::vector< std::string > argv; - argv.push_back(absolute_executable.leaf_name()); - argv.push_back("-r" + params->resfile.str()); - argv.push_back("-s" + absolute_executable.branch_path().str()); - append_to_vector(argv, config_to_args(params->config)); - argv.push_back(params->test_case_name + ":" + params->test_case_part); - - prepare_child(params->workdir); - exec_or_exit(absolute_executable, argv); -} - -static void -tokenize_result(const std::string& line, std::string& out_state, - std::string& out_arg, std::string& out_reason) -{ - const std::string::size_type pos = line.find_first_of(":("); - if (pos == std::string::npos) { - out_state = line; - out_arg = ""; - out_reason = ""; - } else if (line[pos] == ':') { - out_state = line.substr(0, pos); - out_arg = ""; - out_reason = tools::text::trim(line.substr(pos + 1)); - } else if (line[pos] == '(') { - const std::string::size_type pos2 = line.find("):", pos); - if (pos2 == std::string::npos) - throw std::runtime_error("Invalid test case result '" + line + - "': unclosed optional argument"); - out_state = line.substr(0, pos); - out_arg = line.substr(pos + 1, pos2 - pos - 1); - out_reason = tools::text::trim(line.substr(pos2 + 2)); - } else - std::abort(); -} - -static impl::test_case_result -handle_result(const std::string& state, const std::string& arg, - const std::string& reason) -{ - assert(state == "passed"); - - if (!arg.empty() || !reason.empty()) - throw std::runtime_error("The test case result '" + state + "' cannot " - "be accompanied by a reason nor an expected value"); - - return impl::test_case_result(state, -1, reason); -} - -static impl::test_case_result -handle_result_with_reason(const std::string& state, const std::string& arg, - const std::string& reason) -{ - assert(state == "expected_death" || state == "expected_failure" || - state == "expected_timeout" || state == "failed" || state == "skipped"); - - if (!arg.empty() || reason.empty()) - throw std::runtime_error("The test case result '" + state + "' must " - "be accompanied by a reason but not by an expected value"); - - return impl::test_case_result(state, -1, reason); -} - -static impl::test_case_result -handle_result_with_reason_and_arg(const std::string& state, - const std::string& arg, - const std::string& reason) -{ - assert(state == "expected_exit" || state == "expected_signal"); - - if (reason.empty()) - throw std::runtime_error("The test case result '" + state + "' must " - "be accompanied by a reason"); - - int value; - if (arg.empty()) { - value = -1; - } else { - try { - value = tools::text::to_type< int >(arg); - } catch (const std::runtime_error&) { - throw std::runtime_error("The value '" + arg + "' passed to the '" + - state + "' state must be an integer"); - } - } - - return impl::test_case_result(state, value, reason); -} - -} // anonymous namespace - -detail::atf_tp_reader::atf_tp_reader(std::istream& is) : - m_is(is) -{ -} - -detail::atf_tp_reader::~atf_tp_reader(void) -{ -} - -void -detail::atf_tp_reader::got_tc( - const std::string& ident ATF_DEFS_ATTRIBUTE_UNUSED, - const std::map< std::string, std::string >& md ATF_DEFS_ATTRIBUTE_UNUSED) -{ -} - -void -detail::atf_tp_reader::got_eof(void) -{ -} - -void -detail::atf_tp_reader::validate_and_insert(const std::string& name, - const std::string& value, const size_t lineno, - std::map< std::string, std::string >& md) -{ - using tools::parser::parse_error; - - if (value.empty()) - throw parse_error(lineno, "The value for '" + name +"' cannot be " - "empty"); - - const std::string ident_regex = "^[_A-Za-z0-9]+$"; - const std::string integer_regex = "^[0-9]+$"; - - if (name == "descr") { - // Any non-empty value is valid. - } else if (name == "has.cleanup") { - try { - (void)tools::text::to_bool(value); - } catch (const std::runtime_error&) { - throw parse_error(lineno, "The has.cleanup property requires a" - " boolean value"); - } - } else if (name == "ident") { - if (!tools::text::match(value, ident_regex)) - throw parse_error(lineno, "The identifier must match " + - ident_regex + "; was '" + value + "'"); - } else if (name == "require.arch") { - } else if (name == "require.config") { - } else if (name == "require.files") { - } else if (name == "require.machine") { - } else if (name == "require.memory") { - try { - (void)tools::text::to_bytes(value); - } catch (const std::runtime_error&) { - throw parse_error(lineno, "The require.memory property requires an " - "integer value representing an amount of bytes"); - } - } else if (name == "require.progs") { - } else if (name == "require.user") { - } else if (name == "timeout") { - if (!tools::text::match(value, integer_regex)) - throw parse_error(lineno, "The timeout property requires an integer" - " value"); - } else if (name == "use.fs") { - // Deprecated; ignore it. - } else if (name.size() > 2 && name[0] == 'X' && name[1] == '-') { - // Any non-empty value is valid. - } else { - throw parse_error(lineno, "Unknown property '" + name + "'"); - } - - md.insert(std::make_pair(name, value)); -} - -void -detail::atf_tp_reader::read(void) -{ - using tools::parser::parse_error; - using namespace atf_tp; - - std::pair< size_t, tools::parser::headers_map > hml = - tools::parser::read_headers(m_is, 1); - tools::parser::validate_content_type(hml.second, - "application/X-atf-tp", 1); - - tokenizer tkz(m_is, hml.first); - tools::parser::parser< tokenizer > p(tkz); - - try { - tools::parser::token t = p.expect(text_type, "property name"); - if (t.text() != "ident") - throw parse_error(t.lineno(), "First property of a test case " - "must be 'ident'"); - - std::map< std::string, std::string > props; - do { - const std::string name = t.text(); - t = p.expect(colon_type, "`:'"); - const std::string value = tools::text::trim(p.rest_of_line()); - t = p.expect(nl_type, "new line"); - validate_and_insert(name, value, t.lineno(), props); - - t = p.expect(eof_type, nl_type, text_type, "property name, new " - "line or eof"); - if (t.type() == nl_type || t.type() == eof_type) { - const std::map< std::string, std::string >::const_iterator - iter = props.find("ident"); - if (iter == props.end()) - throw parse_error(t.lineno(), "Test case definition did " - "not define an 'ident' property"); - ATF_PARSER_CALLBACK(p, got_tc((*iter).second, props)); - props.clear(); - - if (t.type() == nl_type) { - t = p.expect(text_type, "property name"); - if (t.text() != "ident") - throw parse_error(t.lineno(), "First property of a " - "test case must be 'ident'"); - } - } - } while (t.type() != eof_type); - ATF_PARSER_CALLBACK(p, got_eof()); - } catch (const parse_error& pe) { - p.add_error(pe); - p.reset(nl_type); - } -} - -impl::test_case_result -detail::parse_test_case_result(const std::string& line) -{ - std::string state, arg, reason; - tokenize_result(line, state, arg, reason); - - if (state == "expected_death") - return handle_result_with_reason(state, arg, reason); - else if (state.compare(0, 13, "expected_exit") == 0) - return handle_result_with_reason_and_arg(state, arg, reason); - else if (state.compare(0, 16, "expected_failure") == 0) - return handle_result_with_reason(state, arg, reason); - else if (state.compare(0, 15, "expected_signal") == 0) - return handle_result_with_reason_and_arg(state, arg, reason); - else if (state.compare(0, 16, "expected_timeout") == 0) - return handle_result_with_reason(state, arg, reason); - else if (state == "failed") - return handle_result_with_reason(state, arg, reason); - else if (state == "passed") - return handle_result(state, arg, reason); - else if (state == "skipped") - return handle_result_with_reason(state, arg, reason); - else - throw std::runtime_error("Unknown test case result type in: " + line); -} - -impl::atf_tps_writer::atf_tps_writer(std::ostream& os) : - m_os(os) -{ - tools::parser::headers_map hm; - tools::parser::attrs_map ct_attrs; - ct_attrs["version"] = "3"; - hm["Content-Type"] = - tools::parser::header_entry("Content-Type", "application/X-atf-tps", - ct_attrs); - tools::parser::write_headers(hm, m_os); -} - -void -impl::atf_tps_writer::info(const std::string& what, const std::string& val) -{ - m_os << "info: " << what << ", " << val << "\n"; - m_os.flush(); -} - -void -impl::atf_tps_writer::ntps(size_t p_ntps) -{ - m_os << "tps-count: " << p_ntps << "\n"; - m_os.flush(); -} - -void -impl::atf_tps_writer::start_tp(const std::string& tp, size_t ntcs) -{ - m_tpname = tp; - m_os << "tp-start: " << generate_timestamp() << ", " << tp << ", " - << ntcs << "\n"; - m_os.flush(); -} - -void -impl::atf_tps_writer::end_tp(const std::string& reason) -{ - assert(reason.find('\n') == std::string::npos); - if (reason.empty()) - m_os << "tp-end: " << generate_timestamp() << ", " << m_tpname << "\n"; - else - m_os << "tp-end: " << generate_timestamp() << ", " << m_tpname - << ", " << reason << "\n"; - m_os.flush(); -} - -void -impl::atf_tps_writer::start_tc(const std::string& tcname) -{ - m_tcname = tcname; - m_os << "tc-start: " << generate_timestamp() << ", " << tcname << "\n"; - m_os.flush(); -} - -void -impl::atf_tps_writer::stdout_tc(const std::string& line) -{ - m_os << "tc-so:" << line << "\n"; - check_stream(m_os); - m_os.flush(); - check_stream(m_os); -} - -void -impl::atf_tps_writer::stderr_tc(const std::string& line) -{ - m_os << "tc-se:" << line << "\n"; - check_stream(m_os); - m_os.flush(); - check_stream(m_os); -} - -void -impl::atf_tps_writer::end_tc(const std::string& state, - const std::string& reason) -{ - std::string str = ", " + m_tcname + ", " + state; - if (!reason.empty()) - str += ", " + reason; - m_os << "tc-end: " << generate_timestamp() << str << "\n"; - m_os.flush(); -} - -impl::metadata -impl::get_metadata(const tools::fs::path& executable, - const vars_map& config) -{ - get_metadata_params params(executable, config); - tools::process::child child = - tools::process::fork(get_metadata_child, - tools::process::stream_capture(), - tools::process::stream_inherit(), - static_cast< void * >(¶ms)); - - tools::io::pistream outin(child.stdout_fd()); - - metadata_reader parser(outin); - parser.read(); - - 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"); - - return metadata(parser.get_tcs()); -} - -impl::test_case_result -impl::read_test_case_result(const tools::fs::path& results_path) -{ - std::ifstream results_file(results_path.c_str()); - if (!results_file) - throw std::runtime_error("Failed to open " + results_path.str()); - - std::string line, extra_line; - std::getline(results_file, line); - if (!results_file.good()) - throw std::runtime_error("Results file is empty"); - - while (std::getline(results_file, extra_line).good()) - line += "<>" + extra_line; - - results_file.close(); - - return detail::parse_test_case_result(line); -} - -namespace { - -static volatile bool terminate_poll; - -static void -sigchld_handler(const int signo ATF_DEFS_ATTRIBUTE_UNUSED) -{ - terminate_poll = true; -} - -class child_muxer : public tools::io::muxer { - impl::atf_tps_writer& m_writer; - - void - line_callback(const size_t index, const std::string& line) - { - switch (index) { - case 0: m_writer.stdout_tc(line); break; - case 1: m_writer.stderr_tc(line); break; - default: std::abort(); - } - } - -public: - child_muxer(const int* fds, const size_t nfds, - impl::atf_tps_writer& writer) : - muxer(fds, nfds), - m_writer(writer) - { - } -}; - -} // anonymous namespace - -std::pair< std::string, tools::process::status > -impl::run_test_case(const tools::fs::path& executable, - const std::string& test_case_name, - const std::string& test_case_part, - const vars_map& metadata, - const vars_map& config, - const tools::fs::path& resfile, - const tools::fs::path& workdir, - atf_tps_writer& writer) -{ - // TODO: Capture termination signals and deliver them to the subprocess - // instead. Or maybe do something else; think about it. - - test_case_params params(executable, test_case_name, test_case_part, - metadata, config, resfile, workdir); - tools::process::child child = - tools::process::fork(run_test_case_child, - tools::process::stream_capture(), - tools::process::stream_capture(), - static_cast< void * >(¶ms)); - - terminate_poll = false; - - const vars_map::const_iterator iter = metadata.find("timeout"); - assert(iter != metadata.end()); - const unsigned int timeout = - tools::text::to_type< unsigned int >((*iter).second); - const pid_t child_pid = child.pid(); - - // Get the input stream of stdout and stderr. - tools::io::file_handle outfh = child.stdout_fd(); - tools::io::file_handle errfh = child.stderr_fd(); - - bool timed_out = false; - - // Process the test case's output and multiplex it into our output - // stream as we read it. - int fds[2] = {outfh.get(), errfh.get()}; - child_muxer mux(fds, 2, writer); - try { - timers::child_timer timeout_timer(timeout, child_pid, terminate_poll); - signals::signal_programmer sigchld(SIGCHLD, sigchld_handler); - mux.mux(terminate_poll); - timed_out = timeout_timer.fired(); - } catch (...) { - std::abort(); - } - - ::killpg(child_pid, SIGKILL); - mux.flush(); - tools::process::status status = child.wait(); - - std::string reason; - - if (timed_out) { - // Don't assume the child process has been signaled due to the timeout - // expiration as older versions did. The child process may have exited - // but we may have timed out due to a subchild process getting stuck. - reason = "Test case timed out after " + tools::text::to_string(timeout) + - " " + (timeout == 1 ? "second" : "seconds"); - } - - return std::make_pair(reason, status); -} diff --git a/tools/test-program.hpp b/tools/test-program.hpp deleted file mode 100644 index f2f197289657..000000000000 --- a/tools/test-program.hpp +++ /dev/null @@ -1,157 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_TEST_PROGRAM_HPP) -#define TOOLS_TEST_PROGRAM_HPP - -#include -#include - -#include "fs.hpp" -#include "process.hpp" - -namespace tools { -namespace test_program { - -struct test_case_result { - std::string m_state; - int m_value; - std::string m_reason; - -public: - test_case_result(void) : - m_state("UNINITIALIZED"), - m_value(-1), - m_reason("") - { - } - - test_case_result(const std::string& p_state, const int p_value, - const std::string& p_reason) : - m_state(p_state), - m_value(p_value), - m_reason(p_reason) - { - } - - const std::string& - state(void) const - { - return m_state; - } - - int - value(void) const - { - return m_value; - } - - const std::string& - reason(void) const - { - return m_reason; - } -}; - -namespace detail { - -class atf_tp_reader { - std::istream& m_is; - - void validate_and_insert(const std::string&, const std::string&, - const size_t, - std::map< std::string, std::string >&); - -protected: - virtual void got_tc(const std::string&, - const std::map< std::string, std::string >&); - virtual void got_eof(void); - -public: - atf_tp_reader(std::istream&); - virtual ~atf_tp_reader(void); - - void read(void); -}; - -test_case_result parse_test_case_result(const std::string&); - -} // namespace detail - -class atf_tps_writer { - std::ostream& m_os; - - std::string m_tpname, m_tcname; - -public: - atf_tps_writer(std::ostream&); - - void info(const std::string&, const std::string&); - void ntps(size_t); - - void start_tp(const std::string&, size_t); - void end_tp(const std::string&); - - void start_tc(const std::string&); - void stdout_tc(const std::string&); - void stderr_tc(const std::string&); - void end_tc(const std::string&, const std::string&); -}; - -typedef std::map< std::string, std::map< std::string, std::string > > - test_cases_map; - -struct metadata { - test_cases_map test_cases; - - metadata(void) - { - } - - metadata(const test_cases_map& p_test_cases) : - test_cases(p_test_cases) - { - } -}; - -class atf_tps_writer; - -metadata get_metadata(const tools::fs::path&, - const std::map< std::string, std::string >&); -test_case_result read_test_case_result(const tools::fs::path&); -std::pair< std::string, tools::process::status > run_test_case( - const tools::fs::path&, const std::string&, const std::string&, - const std::map< std::string, std::string >&, - const std::map< std::string, std::string >&, - const tools::fs::path&, const tools::fs::path&, atf_tps_writer&); - -} // namespace test_program -} // namespace tools - -#endif // !defined(TOOLS_TEST_PROGRAM_HPP) diff --git a/tools/test_helpers.hpp b/tools/test_helpers.hpp deleted file mode 100644 index 3ac92d0ea79e..000000000000 --- a/tools/test_helpers.hpp +++ /dev/null @@ -1,116 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2009 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(TOOLS_TEST_HELPERS_H) -# error "Cannot include test_helpers.hpp more than once." -#else -# define TOOLS_TEST_HELPERS_H -#endif - -#include -#include -#include - -#include - -#include "parser.hpp" -#include "text.hpp" - -namespace test_helpers_detail { - -typedef std::vector< std::string > string_vector; - -template< class Reader > -std::pair< string_vector, string_vector > -do_read(const char* input) -{ - string_vector errors; - - std::istringstream is(input); - Reader reader(is); - try { - reader.read(); - } catch (const tools::parser::parse_errors& pes) { - for (std::vector< tools::parser::parse_error >::const_iterator iter = - pes.begin(); iter != pes.end(); iter++) - errors.push_back(*iter); - } catch (const tools::parser::parse_error& pe) { - ATF_FAIL("Raised a lonely parse error: " + - tools::text::to_string(pe.first) + ": " + pe.second); - } - - return std::make_pair(reader.m_calls, errors); -} - -void -check_equal(const char* expected[], const string_vector& actual) -{ - const char** expected_iter = expected; - string_vector::const_iterator actual_iter = actual.begin(); - - bool equals = true; - while (equals && *expected_iter != NULL && actual_iter != actual.end()) { - if (*expected_iter != *actual_iter) { - equals = false; - } else { - expected_iter++; - actual_iter++; - } - } - if (equals && ((*expected_iter == NULL && actual_iter != actual.end()) || - (*expected_iter != NULL && actual_iter == actual.end()))) - equals = false; - - if (!equals) { - std::cerr << "EXPECTED:\n"; - for (expected_iter = expected; *expected_iter != NULL; expected_iter++) - std::cerr << *expected_iter << "\n"; - - std::cerr << "ACTUAL:\n"; - for (actual_iter = actual.begin(); actual_iter != actual.end(); - actual_iter++) - std::cerr << *actual_iter << "\n"; - - ATF_FAIL("Expected results differ to actual values"); - } -} - -} // namespace test_helpers_detail - -template< class Reader > -void -do_parser_test(const char* input, const char* exp_calls[], - const char* exp_errors[]) -{ - const std::pair< test_helpers_detail::string_vector, - test_helpers_detail::string_vector > - actual = test_helpers_detail::do_read< Reader >(input); - test_helpers_detail::check_equal(exp_calls, actual.first); - test_helpers_detail::check_equal(exp_errors, actual.second); -} diff --git a/tools/test_program_test.cpp b/tools/test_program_test.cpp deleted file mode 100644 index 693790d8d462..000000000000 --- a/tools/test_program_test.cpp +++ /dev/null @@ -1,1023 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include - -#include - -#include "parser.hpp" -#include "test-program.hpp" -#include "test_helpers.hpp" -#include "text.hpp" - -namespace impl = tools::test_program; -namespace detail = tools::test_program::detail; - -// ------------------------------------------------------------------------- -// Auxiliary functions. -// ------------------------------------------------------------------------- - -namespace { - -typedef std::map< std::string, std::string > vars_map; - -static -tools::fs::path -get_helper(const atf::tests::tc& tc, const char* name) -{ - return tools::fs::path(tc.get_config_var("srcdir")) / name; -} - -static -void -check_property(const vars_map& props, const char* name, const char* value) -{ - const vars_map::const_iterator iter = props.find(name); - ATF_REQUIRE(iter != props.end()); - ATF_REQUIRE_EQ(value, (*iter).second); -} - -static void -check_result(const char* exp_state, const int exp_value, const char* exp_reason, - const impl::test_case_result& tcr) -{ - ATF_REQUIRE_EQ(exp_state, tcr.state()); - ATF_REQUIRE_EQ(exp_value, tcr.value()); - ATF_REQUIRE_EQ(exp_reason, tcr.reason()); -} - -static -void -write_test_case_result(const char *results_path, const std::string& contents) -{ - std::ofstream results_file(results_path); - ATF_REQUIRE(results_file); - - results_file << contents; -} - -static -void -print_indented(const std::string& str) -{ - std::vector< std::string > ws = tools::text::split(str, "\n"); - for (std::vector< std::string >::const_iterator iter = ws.begin(); - iter != ws.end(); iter++) - std::cout << ">>" << *iter << "<<\n"; -} - -// XXX Should this string handling and verbosity level be part of the -// ATF_REQUIRE_EQ macro? It may be hard to predict sometimes that a -// string can have newlines in it, and so the error message generated -// at the moment will be bogus if there are some. -static -void -check_match(const atf::tests::tc& tc, const std::string& str, - const std::string& exp) -{ - if (!tools::text::match(str, exp)) { - std::cout << "String match check failed.\n" - << "Adding >> and << to delimit the string boundaries " - "below.\n"; - std::cout << "GOT:\n"; - print_indented(str); - std::cout << "EXPECTED:\n"; - print_indented(exp); - tc.fail("Constructed string differs from the expected one"); - } -} - -} // anonymous namespace - -// ------------------------------------------------------------------------- -// Tests for the "tp" reader. -// ------------------------------------------------------------------------- - -class tp_reader : protected detail::atf_tp_reader { - void - got_tc(const std::string& ident, - const std::map< std::string, std::string >& md) - { - std::string call = "got_tc(" + ident + ", {"; - for (std::map< std::string, std::string >::const_iterator iter = - md.begin(); iter != md.end(); iter++) { - if (iter != md.begin()) - call += ", "; - call += (*iter).first + '=' + (*iter).second; - } - call += "})"; - m_calls.push_back(call); - } - - void - got_eof(void) - { - m_calls.push_back("got_eof()"); - } - -public: - tp_reader(std::istream& is) : - detail::atf_tp_reader(is) - { - } - - void - read(void) - { - atf_tp_reader::read(); - } - - std::vector< std::string > m_calls; -}; - -ATF_TEST_CASE_WITHOUT_HEAD(tp_1); -ATF_TEST_CASE_BODY(tp_1) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: test_case_1\n" - "\n" - "ident: test_case_2\n" - "\n" - "ident: test_case_3\n" - ; - - const char* exp_calls[] = { - "got_tc(test_case_1, {ident=test_case_1})", - "got_tc(test_case_2, {ident=test_case_2})", - "got_tc(test_case_3, {ident=test_case_3})", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_2); -ATF_TEST_CASE_BODY(tp_2) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: test_case_1\n" - "descr: This is the description\n" - "timeout: 300\n" - "\n" - "ident: test_case_2\n" - "\n" - "ident: test_case_3\n" - "X-prop1: A custom property\n" - "descr: Third test case\n" - ; - - // NO_CHECK_STYLE_BEGIN - const char* exp_calls[] = { - "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()", - NULL - }; - // NO_CHECK_STYLE_END - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_3); -ATF_TEST_CASE_BODY(tp_3) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: single_test\n" - "descr: Some description\n" - "timeout: 300\n" - "require.arch: thearch\n" - "require.config: foo-bar\n" - "require.files: /a/1 /b/2\n" - "require.machine: themachine\n" - "require.progs: /bin/cp mv\n" - "require.user: root\n" - ; - - // 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.files=/a/1 /b/2, require.machine=themachine, require.progs=/bin/cp mv, require.user=root, timeout=300})", - "got_eof()", - NULL - }; - // NO_CHECK_STYLE_END - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_4); -ATF_TEST_CASE_BODY(tp_4) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: single_test \n" - "descr: Some description \n" - ; - - const char* exp_calls[] = { - "got_tc(single_test, {descr=Some description, ident=single_test})", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_50); -ATF_TEST_CASE_BODY(tp_50) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected property name", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_51); -ATF_TEST_CASE_BODY(tp_51) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "\n" - "\n" - "\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected property name", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_52); -ATF_TEST_CASE_BODY(tp_52) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: test1\n" - "ident: test2\n" - ; - - const char* exp_calls[] = { - "got_tc(test1, {ident=test1})", - "got_eof()", - NULL - }; - - const char* exp_errors[] = { - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_53); -ATF_TEST_CASE_BODY(tp_53) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "descr: Out of order\n" - "ident: test1\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: First property of a test case must be 'ident'", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_54); -ATF_TEST_CASE_BODY(tp_54) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident:\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: The value for 'ident' cannot be empty", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_55); -ATF_TEST_CASE_BODY(tp_55) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: +*,\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: The identifier must match ^[_A-Za-z0-9]+$; was '+*,'", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_56); -ATF_TEST_CASE_BODY(tp_56) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: test\n" - "timeout: hello\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "4: The timeout property requires an integer value", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_57); -ATF_TEST_CASE_BODY(tp_57) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: test\n" - "unknown: property\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "4: Unknown property 'unknown'", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_58); -ATF_TEST_CASE_BODY(tp_58) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: test\n" - "X-foo:\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "4: The value for 'X-foo' cannot be empty", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_59); -ATF_TEST_CASE_BODY(tp_59) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "\n" - "ident: test\n" - "timeout: 300\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "3: Unexpected token `<>'; expected property name", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -ATF_TEST_CASE_WITHOUT_HEAD(tp_60); -ATF_TEST_CASE_BODY(tp_60) -{ - const char* input = - "Content-Type: application/X-atf-tp; version=\"1\"\n" - "\n" - "ident: test\n" - "require.memory: 12345D\n" - ; - - const char* exp_calls[] = { - NULL - }; - - const char* exp_errors[] = { - "4: The require.memory property requires an integer value representing" - " an amount of bytes", - NULL - }; - - do_parser_test< tp_reader >(input, exp_calls, exp_errors); -} - -// ------------------------------------------------------------------------- -// Tests for the "tps" writer. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE(atf_tps_writer); -ATF_TEST_CASE_HEAD(atf_tps_writer) -{ - set_md_var("descr", "Verifies the application/X-atf-tps writer"); -} -ATF_TEST_CASE_BODY(atf_tps_writer) -{ - std::ostringstream expss; - std::ostringstream ss; - const char *ts_regex = "[0-9]+\\.[0-9]{1,6}, "; - -#define RESET \ - expss.str(""); \ - ss.str("") - -#define CHECK \ - check_match(*this, ss.str(), expss.str()) - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - } - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - - w.info("foo", "bar"); - expss << "info: foo, bar\n"; - CHECK; - - w.info("baz", "second info"); - expss << "info: baz, second info\n"; - CHECK; - } - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - - w.ntps(0); - expss << "tps-count: 0\n"; - CHECK; - } - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - - w.ntps(123); - expss << "tps-count: 123\n"; - CHECK; - } - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - - w.ntps(2); - expss << "tps-count: 2\n"; - CHECK; - - w.start_tp("foo", 0); - expss << "tp-start: " << ts_regex << "foo, 0\n"; - CHECK; - - w.end_tp(""); - expss << "tp-end: " << ts_regex << "foo\n"; - CHECK; - - w.start_tp("bar", 0); - expss << "tp-start: " << ts_regex << "bar, 0\n"; - CHECK; - - w.end_tp("failed program"); - expss << "tp-end: " << ts_regex << "bar, failed program\n"; - CHECK; - } - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - - w.ntps(1); - expss << "tps-count: 1\n"; - CHECK; - - w.start_tp("foo", 1); - expss << "tp-start: " << ts_regex << "foo, 1\n"; - CHECK; - - w.start_tc("brokentc"); - expss << "tc-start: " << ts_regex << "brokentc\n"; - CHECK; - - w.end_tp("aborted"); - expss << "tp-end: " << ts_regex << "foo, aborted\n"; - CHECK; - } - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - - w.ntps(1); - expss << "tps-count: 1\n"; - CHECK; - - w.start_tp("thetp", 3); - expss << "tp-start: " << ts_regex << "thetp, 3\n"; - CHECK; - - w.start_tc("passtc"); - expss << "tc-start: " << ts_regex << "passtc\n"; - CHECK; - - w.end_tc("passed", ""); - expss << "tc-end: " << ts_regex << "passtc, passed\n"; - CHECK; - - w.start_tc("failtc"); - expss << "tc-start: " << ts_regex << "failtc\n"; - CHECK; - - w.end_tc("failed", "The reason"); - expss << "tc-end: " << ts_regex << "failtc, failed, The reason\n"; - CHECK; - - w.start_tc("skiptc"); - expss << "tc-start: " << ts_regex << "skiptc\n"; - CHECK; - - w.end_tc("skipped", "The reason"); - expss << "tc-end: " << ts_regex << "skiptc, skipped, The reason\n"; - CHECK; - - w.end_tp(""); - expss << "tp-end: " << ts_regex << "thetp\n"; - CHECK; - } - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - - w.ntps(1); - expss << "tps-count: 1\n"; - CHECK; - - w.start_tp("thetp", 1); - expss << "tp-start: " << ts_regex << "thetp, 1\n"; - CHECK; - - w.start_tc("thetc"); - expss << "tc-start: " << ts_regex << "thetc\n"; - CHECK; - - w.stdout_tc("a line"); - expss << "tc-so:a line\n"; - CHECK; - - w.stdout_tc("another line"); - expss << "tc-so:another line\n"; - CHECK; - - w.stderr_tc("an error message"); - expss << "tc-se:an error message\n"; - CHECK; - - w.end_tc("passed", ""); - expss << "tc-end: " << ts_regex << "thetc, passed\n"; - CHECK; - - w.end_tp(""); - expss << "tp-end: " << ts_regex << "thetp\n"; - CHECK; - } - - { - RESET; - - impl::atf_tps_writer w(ss); - expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n"; - CHECK; - - w.ntps(1); - expss << "tps-count: 1\n"; - CHECK; - - w.start_tp("thetp", 0); - expss << "tp-start: " << ts_regex << "thetp, 0\n"; - CHECK; - - w.end_tp(""); - expss << "tp-end: " << ts_regex << "thetp\n"; - CHECK; - - w.info("foo", "bar"); - expss << "info: foo, bar\n"; - CHECK; - - w.info("baz", "second value"); - expss << "info: baz, second value\n"; - CHECK; - } - -#undef CHECK -#undef RESET -} - -// ------------------------------------------------------------------------- -// Tests for the free functions. -// ------------------------------------------------------------------------- - -ATF_TEST_CASE(get_metadata_bad); -ATF_TEST_CASE_HEAD(get_metadata_bad) {} -ATF_TEST_CASE_BODY(get_metadata_bad) { - const tools::fs::path executable = get_helper(*this, "bad_metadata_helper"); - ATF_REQUIRE_THROW(tools::parser::parse_errors, - impl::get_metadata(executable, vars_map())); -} - -ATF_TEST_CASE(get_metadata_zero_tcs); -ATF_TEST_CASE_HEAD(get_metadata_zero_tcs) {} -ATF_TEST_CASE_BODY(get_metadata_zero_tcs) { - const tools::fs::path executable = get_helper(*this, "zero_tcs_helper"); - ATF_REQUIRE_THROW(tools::parser::parse_errors, - impl::get_metadata(executable, vars_map())); -} - -ATF_TEST_CASE(get_metadata_several_tcs); -ATF_TEST_CASE_HEAD(get_metadata_several_tcs) {} -ATF_TEST_CASE_BODY(get_metadata_several_tcs) { - const tools::fs::path executable = get_helper(*this, "several_tcs_helper"); - const impl::metadata md = impl::get_metadata(executable, vars_map()); - ATF_REQUIRE_EQ(3, md.test_cases.size()); - - { - const impl::test_cases_map::const_iterator iter = - md.test_cases.find("first"); - ATF_REQUIRE(iter != md.test_cases.end()); - - ATF_REQUIRE_EQ(4, (*iter).second.size()); - 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", "300"); - } - - { - const impl::test_cases_map::const_iterator iter = - md.test_cases.find("second"); - ATF_REQUIRE(iter != md.test_cases.end()); - - ATF_REQUIRE_EQ(5, (*iter).second.size()); - check_property((*iter).second, "descr", "Description 2"); - check_property((*iter).second, "has.cleanup", "true"); - check_property((*iter).second, "ident", "second"); - check_property((*iter).second, "timeout", "500"); - check_property((*iter).second, "X-property", "Custom property"); - } - - { - const impl::test_cases_map::const_iterator iter = - md.test_cases.find("third"); - ATF_REQUIRE(iter != md.test_cases.end()); - - 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", "300"); - } -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_death); -ATF_TEST_CASE_BODY(parse_test_case_result_expected_death) { - check_result("expected_death", -1, "foo bar", - detail::parse_test_case_result("expected_death: foo bar")); - - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_death")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_death(3): foo")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_exit); -ATF_TEST_CASE_BODY(parse_test_case_result_expected_exit) { - check_result("expected_exit", -1, "foo bar", - detail::parse_test_case_result("expected_exit: foo bar")); - check_result("expected_exit", -1, "foo bar", - detail::parse_test_case_result("expected_exit(): foo bar")); - check_result("expected_exit", 5, "foo bar", - detail::parse_test_case_result("expected_exit(5): foo bar")); - - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_exit")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_exit(")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_failure); -ATF_TEST_CASE_BODY(parse_test_case_result_expected_failure) { - check_result("expected_failure", -1, "foo bar", - detail::parse_test_case_result("expected_failure: foo bar")); - - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_failure")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_failure(3): foo")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_signal); -ATF_TEST_CASE_BODY(parse_test_case_result_expected_signal) { - check_result("expected_signal", -1, "foo bar", - detail::parse_test_case_result("expected_signal: foo bar")); - check_result("expected_signal", -1, "foo bar", - detail::parse_test_case_result("expected_signal(): foo bar")); - check_result("expected_signal", 5, "foo bar", - detail::parse_test_case_result("expected_signal(5): foo bar")); - - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_signal")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_signal(")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_timeout); -ATF_TEST_CASE_BODY(parse_test_case_result_expected_timeout) { - check_result("expected_timeout", -1, "foo bar", - detail::parse_test_case_result("expected_timeout: foo bar")); - - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_timeout")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("expected_timeout(3): foo")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_failed); -ATF_TEST_CASE_BODY(parse_test_case_result_failed) { - check_result("failed", -1, "foo bar", - detail::parse_test_case_result("failed: foo bar")); - - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("failed")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("failed(3): foo")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_passed); -ATF_TEST_CASE_BODY(parse_test_case_result_passed) { - check_result("passed", -1, "", - detail::parse_test_case_result("passed")); - - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("passed: foo")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("passed(3): foo")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_skipped); -ATF_TEST_CASE_BODY(parse_test_case_result_skipped) { - check_result("skipped", -1, "foo bar", - detail::parse_test_case_result("skipped: foo bar")); - - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("skipped")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("skipped(3): foo")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_unknown); -ATF_TEST_CASE_BODY(parse_test_case_result_unknown) { - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("foo")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("bar: foo")); - ATF_REQUIRE_THROW(std::runtime_error, - detail::parse_test_case_result("baz: foo")); -} - -ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_failed); -ATF_TEST_CASE_BODY(read_test_case_result_failed) { - write_test_case_result("resfile", "failed: foo bar\n"); - const impl::test_case_result tcr = impl::read_test_case_result( - tools::fs::path("resfile")); - ATF_REQUIRE_EQ("failed", tcr.state()); - ATF_REQUIRE_EQ("foo bar", tcr.reason()); -} - -ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_skipped); -ATF_TEST_CASE_BODY(read_test_case_result_skipped) { - write_test_case_result("resfile", "skipped: baz bar\n"); - const impl::test_case_result tcr = impl::read_test_case_result( - tools::fs::path("resfile")); - ATF_REQUIRE_EQ("skipped", tcr.state()); - ATF_REQUIRE_EQ("baz bar", tcr.reason()); -} - - -ATF_TEST_CASE(read_test_case_result_no_file); -ATF_TEST_CASE_HEAD(read_test_case_result_no_file) {} -ATF_TEST_CASE_BODY(read_test_case_result_no_file) { - ATF_REQUIRE_THROW(std::runtime_error, - impl::read_test_case_result(tools::fs::path("resfile"))); -} - -ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_empty_file); -ATF_TEST_CASE_BODY(read_test_case_result_empty_file) { - write_test_case_result("resfile", ""); - ATF_REQUIRE_THROW(std::runtime_error, - impl::read_test_case_result(tools::fs::path("resfile"))); -} - -ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_invalid); -ATF_TEST_CASE_BODY(read_test_case_result_invalid) { - write_test_case_result("resfile", "passed: hello\n"); - ATF_REQUIRE_THROW(std::runtime_error, - impl::read_test_case_result(tools::fs::path("resfile"))); -} - -ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_multiline); -ATF_TEST_CASE_BODY(read_test_case_result_multiline) { - write_test_case_result("resfile", "skipped: foo\nbar\n"); - const impl::test_case_result tcr = impl::read_test_case_result( - tools::fs::path("resfile")); - ATF_REQUIRE_EQ("skipped", tcr.state()); - ATF_REQUIRE_EQ("foo<>bar", tcr.reason()); -} - -// ------------------------------------------------------------------------- -// Main. -// ------------------------------------------------------------------------- - -ATF_INIT_TEST_CASES(tcs) -{ - ATF_ADD_TEST_CASE(tcs, tp_1); - ATF_ADD_TEST_CASE(tcs, tp_2); - ATF_ADD_TEST_CASE(tcs, tp_3); - ATF_ADD_TEST_CASE(tcs, tp_4); - ATF_ADD_TEST_CASE(tcs, tp_50); - ATF_ADD_TEST_CASE(tcs, tp_51); - ATF_ADD_TEST_CASE(tcs, tp_52); - ATF_ADD_TEST_CASE(tcs, tp_53); - ATF_ADD_TEST_CASE(tcs, tp_54); - ATF_ADD_TEST_CASE(tcs, tp_55); - ATF_ADD_TEST_CASE(tcs, tp_56); - ATF_ADD_TEST_CASE(tcs, tp_57); - ATF_ADD_TEST_CASE(tcs, tp_58); - ATF_ADD_TEST_CASE(tcs, tp_59); - ATF_ADD_TEST_CASE(tcs, tp_60); - - ATF_ADD_TEST_CASE(tcs, atf_tps_writer); - - ATF_ADD_TEST_CASE(tcs, get_metadata_bad); - ATF_ADD_TEST_CASE(tcs, get_metadata_zero_tcs); - ATF_ADD_TEST_CASE(tcs, get_metadata_several_tcs); - - ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_death); - ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_exit); - ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_failure); - ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_signal); - ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_timeout); - ATF_ADD_TEST_CASE(tcs, parse_test_case_result_failed); - ATF_ADD_TEST_CASE(tcs, parse_test_case_result_passed); - 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); - ATF_ADD_TEST_CASE(tcs, read_test_case_result_invalid); - - // TODO: Add tests for run_test_case once all the missing functionality - // is implemented. -} diff --git a/tools/tests-results.css b/tools/tests-results.css deleted file mode 100644 index 24fc12cbf30d..000000000000 --- a/tools/tests-results.css +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Automated Testing Framework (atf) - * - * Copyright (c) 2007 The NetBSD Foundation, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -body { - margin: 0 0 0 0; -} - -.nobr { - white-space: nowrap; -} - -h1 { - background: black; - color: white; - font-family: Arial; - font-size: 24pt; - padding: 5pt; -} - -h2 { - background: #eeeeee; - font-family: Arial; - font-size: 16pt; - margin-left: 10pt; - margin-right: 10pt; - padding: 3pt; -} - -h3 { - font-family: Arial; - font-size: 12pt; - margin-left: 20pt; - margin-right: 20pt; - padding: 3pt; -} - -p.details { - margin-left: 20pt; - margin-right: 20pt; -} - -p.term { - margin-left: 40pt; - margin-right: 40pt; -} - -pre.so { - margin-left: 40pt; - margin-right: 40pt; -} - -pre.se { - margin-left: 40pt; - margin-right: 40pt; -} - -table.summary { - border-collapse: collapse; - border-color: black; - border-style: solid; - border-width: 1pt; - margin-left: auto; - margin-right: auto; -} - -table.summary th { - background: #aaaadd; - border-style: solid; - border-width: 1pt; - padding: 3pt 6pt 3pt 6pt; -} - -table.summary td { - border-style: solid; - border-width: 1pt; - padding: 3pt 6pt 3pt 6pt; -} - -table.summary td.numeric p { - text-align: right; -} - -table.summary td.numeric-error p { - text-align: right; - color: red; -} - -table.summary td.numeric-warning p { - text-align: right; - color: #aaaa00; -} - -table.summary tr.group { - background: #dddddd; -} - -table.summary tr.entry td p { - margin-left: 10pt; -} - -table.tcs-summary { - border-collapse: collapse; - border-color: black; - border-style: solid; - border-width: 1pt; - margin-left: auto; - margin-right: auto; - width: 80%; -} - -table.tcs-summary td { - border-style: solid; - border-width: 1pt; - padding: 3pt 6pt 3pt 6pt; -} - -table.tcs-summary th { - background: #aaaadd; - border-style: solid; - border-width: 1pt; - padding: 3pt 6pt 3pt 6pt; -} - -table.tcs-summary td.numeric { - width: 1pt; -} - -table.tcs-summary td.numeric p { - text-align: right; -} - -table.tcs-summary td.tp-numeric { - background: #dddddd; - width: 1pt; -} - -table.tcs-summary td.tp-numeric p { - text-align: right; -} - -table.tcs-summary td.tp-id { - background: #dddddd; - font-weight: bold; - width: 1pt; -} - -table.tcs-summary td.tc-id p { - margin-left: 10pt; -} - -table.tcs-summary td.tcr-passed { - background: #aaffaa; - width: 1pt; -} - -table.tcs-summary td.tcr-failed { - background: #ffaaaa; - width: 1pt; -} - -table.tcs-summary td.tcr-skipped { - background: #ffffaa; - width: 1pt; -} - -table.tcs-summary td.tcr-xfail { - background: #ffaaff; - width: 1pt; -} - -table.tcs-summary td.tcr-reason { - width: 100%; -} diff --git a/tools/tests-results.dtd b/tools/tests-results.dtd deleted file mode 100644 index c16f7edfb53f..000000000000 --- a/tools/tests-results.dtd +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/tests-results.xsl b/tools/tests-results.xsl deleted file mode 100644 index 91b77c5435b5..000000000000 --- a/tools/tests-results.xsl +++ /dev/null @@ -1,564 +0,0 @@ - -]> - - - - - - - tests-results.css - ATF Tests Results - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="$global.title" /> - - - -

- - - - - - - - - - - - - - - - - - - - - - - -

Execution summary

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Item

Value

ATF

Version

Timings

Start time of tests

End time of tests

System information

Host name

Operating system

Operating system release

Operating system version

Platform

Tests results

Root

Test programs

Bogus test - programs

 -

-

Bogus test programs

 -

-

Test cases

Passed test cases

Failed test - cases

 -

-

Failed test cases

 -

-

Expected - failures

 -

-

Expected failures

 -

-

Skipped test - cases

 -

-

Skipped test cases

 -

-

See more execution - details

- - - - -

Execution details

- -

Environment variables

- -
    - - - -
- - - -
  • -

    -
    • -     - - -

    Test cases summary

    - - - - - - - - - - all - -

    Test case

    Result

    Reason

    Duration

    -     - - -     -

    Expected failures summary

    - - - - - - - - - - xfail - -

    Test case

    Result

    Reason

    Duration

    - - - -     -

    Failed test cases summary

    - - - - - - - - - - failed - -

    Test case

    Result

    Reason

    Duration

    - - - -     -

    Bogus test programs summary

    - - - - - - - bogus - -
    Test program
    - - - -     -

    Skipped test cases summary

    - - - - - - - - - - skipped - -

    Test case

    Result

    Reason

    Duration

    - - - - - - - - yes - yes - yes - yes - yes - yes - yes - yes - yes - yes - no - - - - - - -

    - - -

    s

    - - - - - - - -     -     - - - - - - - - - yes - yes - yes - yes - yes - yes - yes - yes - yes - no - - - - - - - - -

    - - -

    -     - - - - -

    s

    - - - - - - -

    Passed

    -

    N/A

    -     - - -

    Expected death

    -

    -     - - -

    Expected exit

    -

    -     - - -

    Expected failure

    -

    -     - - -

    Expected timeout

    -

    -     - - -

    Expected signal

    -

    -     - - -

    Failed

    -

    -     - - -

    Skipped

    -

    -     - - - - - - -

    FAILED:

    -     - - -

    XFAIL:

    -     - - -

    SKIPPED:

    -     - - - - - -

    Test case: - / -

    - - -

    Duration: -

    -     - -

    Termination reason

    - - - -

    Standard output stream

    -
    -     - - -

    Standard error stream

    -
    -     -     - - - seconds - - - - - - - - - - - - - - - - - - - - - - - - -     diff --git a/tools/text.cpp b/tools/text.cpp deleted file mode 100644 index 9084f7e808e0..000000000000 --- a/tools/text.cpp +++ /dev/null @@ -1,158 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -} - -#include -#include -#include - -#include "exceptions.hpp" -#include "text.hpp" - -namespace impl = tools::text; -#define IMPL_NAME "tools::text" - -char* -impl::duplicate(const char* str) -{ - char* copy = new char[std::strlen(str) + 1]; - std::strcpy(copy, str); - return copy; -} - -bool -impl::match(const std::string& str, const std::string& regex) -{ - bool found; - - // Special case: regcomp does not like empty regular expressions. - if (regex.empty()) { - found = str.empty(); - } else { - ::regex_t preg; - - if (::regcomp(&preg, regex.c_str(), REG_EXTENDED) != 0) - throw std::runtime_error("Invalid regular expression '" + regex + - "'"); - - const int res = ::regexec(&preg, str.c_str(), 0, NULL, 0); - regfree(&preg); - if (res != 0 && res != REG_NOMATCH) - throw std::runtime_error("Invalid regular expression " + regex); - - found = res == 0; - } - - return found; -} - -std::string -impl::to_lower(const std::string& str) -{ - std::string lc; - for (std::string::const_iterator iter = str.begin(); iter != str.end(); - iter++) - lc += std::tolower(*iter); - return lc; -} - -std::vector< std::string > -impl::split(const std::string& str, const std::string& delim) -{ - std::vector< std::string > words; - - std::string::size_type pos = 0, newpos = 0; - while (pos < str.length() && newpos != std::string::npos) { - newpos = str.find(delim, pos); - if (newpos != pos) - words.push_back(str.substr(pos, newpos - pos)); - pos = newpos + delim.length(); - } - - return words; -} - -std::string -impl::trim(const std::string& str) -{ - std::string::size_type pos1 = str.find_first_not_of(" \t"); - std::string::size_type pos2 = str.find_last_not_of(" \t"); - - if (pos1 == std::string::npos && pos2 == std::string::npos) - return ""; - else if (pos1 == std::string::npos) - return str.substr(0, str.length() - pos2); - else if (pos2 == std::string::npos) - return str.substr(pos1); - else - return str.substr(pos1, pos2 - pos1 + 1); -} - -bool -impl::to_bool(const std::string& str) -{ - const std::string lower = to_lower(str); - if (lower == "yes" || lower == "true") - return true; - else if (lower == "no" || lower == "false") - return false; - else { - // XXX Not really a libc error. - throw system_error(IMPL_NAME "::to_bool", "Cannot convert string " - "'" + str + "' to boolean", EINVAL); - } -} - -int64_t -impl::to_bytes(std::string str) -{ - if (str.empty()) - throw std::runtime_error("Empty value"); - - const char unit = str[str.length() - 1]; - int64_t multiplier; - switch (unit) { - case 'k': case 'K': multiplier = 1 << 10; break; - case 'm': case 'M': multiplier = 1 << 20; break; - case 'g': case 'G': multiplier = 1 << 30; break; - case 't': case 'T': multiplier = int64_t(1) << 40; break; - default: - if (!std::isdigit(unit)) - throw std::runtime_error(std::string("Unknown size unit '") + unit - + "'"); - multiplier = 1; - } - if (multiplier != 1) - str.erase(str.length() - 1); - - return to_type< int64_t >(str) * multiplier; -} diff --git a/tools/text.hpp b/tools/text.hpp deleted file mode 100644 index 0b3dbaad0f96..000000000000 --- a/tools/text.hpp +++ /dev/null @@ -1,153 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_TEXT_HPP) -#define TOOLS_TEXT_HPP - -extern "C" { -#include -} - -#include -#include -#include -#include - -namespace tools { -namespace text { - -//! -//! \brief Duplicates a C string using the new[] allocator. -//! -//! Replaces the functionality of strdup by using the new[] allocator and -//! thus allowing the resulting memory to be managed by utils::auto_array. -//! -char* duplicate(const char*); - -//! -//! \brief Joins multiple words into a string. -//! -//! Joins a list of words into a string, separating them using the provided -//! separator. Empty words are not omitted. -//! -template< class T > -std::string -join(const T& words, const std::string& separator) -{ - std::string str; - - typename T::const_iterator iter = words.begin(); - bool done = iter == words.end(); - while (!done) { - str += *iter; - iter++; - if (iter != words.end()) - str += separator; - else - done = true; - } - - return str; -} - -//! -//! \brief Checks if the string matches a regular expression. -//! -bool match(const std::string&, const std::string&); - -//! -//! \brief Splits a string into words. -//! -//! Splits the given string into multiple words, all separated by the -//! given delimiter. Multiple occurrences of the same delimiter are -//! not condensed so that rejoining the words later on using the same -//! delimiter results in the original string. -//! -std::vector< std::string > split(const std::string&, const std::string&); - -//! -//! \brief Removes whitespace from the beginning and end of a string. -//! -std::string trim(const std::string&); - -//! -//! \brief Converts a string to a boolean value. -//! -bool to_bool(const std::string&); - -//! -//! \brief Converts the given string to a bytes size. -//! -int64_t to_bytes(std::string); - -//! -//! \brief Changes the case of a string to lowercase. -//! -//! Returns a new string that is a lowercased version of the original -//! one. -//! -std::string to_lower(const std::string&); - -//! -//! \brief Converts the given object to a string. -//! -//! Returns a string with the representation of the given object. There -//! must exist an operator<< method for that object. -//! -template< class T > -std::string -to_string(const T& ob) -{ - std::ostringstream ss; - ss << ob; - return ss.str(); -} - -//! -//! \brief Converts the given string to another type. -//! -//! Attempts to convert the given string to the requested type. Throws -//! an exception if the conversion failed. -//! -template< class T > -T -to_type(const std::string& str) -{ - std::istringstream ss(str); - T value; - ss >> value; - if (!ss.eof() || (ss.eof() && (ss.fail() || ss.bad()))) - throw std::runtime_error("Cannot convert string to requested type"); - return value; -} - -} // namespace text -} // namespace tools - -#endif // !defined(TOOLS_TEXT_HPP) diff --git a/tools/text_test.cpp b/tools/text_test.cpp deleted file mode 100644 index 0fa31d827328..000000000000 --- a/tools/text_test.cpp +++ /dev/null @@ -1,390 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include -#include - -#include - -#include "text.hpp" - -// ------------------------------------------------------------------------ -// Test cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(duplicate); -ATF_TEST_CASE_HEAD(duplicate) -{ - set_md_var("descr", "Tests the duplicate function"); -} -ATF_TEST_CASE_BODY(duplicate) -{ - using tools::text::duplicate; - - const char* orig = "foo"; - - char* copy = duplicate(orig); - ATF_REQUIRE_EQ(std::strlen(copy), 3); - ATF_REQUIRE(std::strcmp(copy, "foo") == 0); - - std::strcpy(copy, "bar"); - ATF_REQUIRE(std::strcmp(copy, "bar") == 0); - ATF_REQUIRE(std::strcmp(orig, "foo") == 0); -} - -ATF_TEST_CASE(join); -ATF_TEST_CASE_HEAD(join) -{ - set_md_var("descr", "Tests the join function"); -} -ATF_TEST_CASE_BODY(join) -{ - using tools::text::join; - - // First set of tests using a non-sorted collection, std::vector. - { - std::vector< std::string > words; - std::string str; - - words.clear(); - str = join(words, ","); - ATF_REQUIRE_EQ(str, ""); - - words.clear(); - words.push_back(""); - str = join(words, ","); - ATF_REQUIRE_EQ(str, ""); - - words.clear(); - words.push_back(""); - words.push_back(""); - str = join(words, ","); - ATF_REQUIRE_EQ(str, ","); - - words.clear(); - words.push_back("foo"); - words.push_back(""); - words.push_back("baz"); - str = join(words, ","); - ATF_REQUIRE_EQ(str, "foo,,baz"); - - words.clear(); - words.push_back("foo"); - words.push_back("bar"); - words.push_back("baz"); - str = join(words, ","); - ATF_REQUIRE_EQ(str, "foo,bar,baz"); - } - - // Second set of tests using a sorted collection, std::set. - { - std::set< std::string > words; - std::string str; - - words.clear(); - str = join(words, ","); - ATF_REQUIRE_EQ(str, ""); - - words.clear(); - words.insert(""); - str = join(words, ","); - ATF_REQUIRE_EQ(str, ""); - - words.clear(); - words.insert("foo"); - words.insert(""); - words.insert("baz"); - str = join(words, ","); - ATF_REQUIRE_EQ(str, ",baz,foo"); - - words.clear(); - words.insert("foo"); - words.insert("bar"); - words.insert("baz"); - str = join(words, ","); - ATF_REQUIRE_EQ(str, "bar,baz,foo"); - } -} - -ATF_TEST_CASE(match); -ATF_TEST_CASE_HEAD(match) -{ - set_md_var("descr", "Tests the match function"); -} -ATF_TEST_CASE_BODY(match) -{ - using tools::text::match; - - ATF_REQUIRE_THROW(std::runtime_error, match("", "[")); - - ATF_REQUIRE(match("", "")); - ATF_REQUIRE(!match("foo", "")); - - ATF_REQUIRE(match("", ".*")); - ATF_REQUIRE(match("", "[a-z]*")); - - ATF_REQUIRE(match("hello", "hello")); - ATF_REQUIRE(match("hello", "[a-z]+")); - ATF_REQUIRE(match("hello", "^[a-z]+$")); - - ATF_REQUIRE(!match("hello", "helooo")); - ATF_REQUIRE(!match("hello", "[a-z]+5")); - ATF_REQUIRE(!match("hello", "^ [a-z]+$")); -} - -ATF_TEST_CASE(split); -ATF_TEST_CASE_HEAD(split) -{ - set_md_var("descr", "Tests the split function"); -} -ATF_TEST_CASE_BODY(split) -{ - using tools::text::split; - - std::vector< std::string > words; - - words = split("", " "); - ATF_REQUIRE_EQ(words.size(), 0); - - words = split(" ", " "); - ATF_REQUIRE_EQ(words.size(), 0); - - words = split(" ", " "); - ATF_REQUIRE_EQ(words.size(), 0); - - words = split("a b", " "); - ATF_REQUIRE_EQ(words.size(), 2); - ATF_REQUIRE_EQ(words[0], "a"); - ATF_REQUIRE_EQ(words[1], "b"); - - words = split("a b c d", " "); - ATF_REQUIRE_EQ(words.size(), 4); - ATF_REQUIRE_EQ(words[0], "a"); - ATF_REQUIRE_EQ(words[1], "b"); - ATF_REQUIRE_EQ(words[2], "c"); - ATF_REQUIRE_EQ(words[3], "d"); - - words = split("foo bar", " "); - ATF_REQUIRE_EQ(words.size(), 2); - ATF_REQUIRE_EQ(words[0], "foo"); - ATF_REQUIRE_EQ(words[1], "bar"); - - words = split("foo bar baz foobar", " "); - ATF_REQUIRE_EQ(words.size(), 4); - ATF_REQUIRE_EQ(words[0], "foo"); - ATF_REQUIRE_EQ(words[1], "bar"); - ATF_REQUIRE_EQ(words[2], "baz"); - ATF_REQUIRE_EQ(words[3], "foobar"); - - words = split(" foo bar", " "); - ATF_REQUIRE_EQ(words.size(), 2); - ATF_REQUIRE_EQ(words[0], "foo"); - ATF_REQUIRE_EQ(words[1], "bar"); - - words = split("foo bar", " "); - ATF_REQUIRE_EQ(words.size(), 2); - ATF_REQUIRE_EQ(words[0], "foo"); - ATF_REQUIRE_EQ(words[1], "bar"); - - words = split("foo bar ", " "); - ATF_REQUIRE_EQ(words.size(), 2); - ATF_REQUIRE_EQ(words[0], "foo"); - ATF_REQUIRE_EQ(words[1], "bar"); - - words = split(" foo bar ", " "); - ATF_REQUIRE_EQ(words.size(), 2); - ATF_REQUIRE_EQ(words[0], "foo"); - ATF_REQUIRE_EQ(words[1], "bar"); -} - -ATF_TEST_CASE(split_delims); -ATF_TEST_CASE_HEAD(split_delims) -{ - set_md_var("descr", "Tests the split function using different delimiters"); -} -ATF_TEST_CASE_BODY(split_delims) -{ - using tools::text::split; - - std::vector< std::string > words; - - words = split("", "/"); - ATF_REQUIRE_EQ(words.size(), 0); - - words = split(" ", "/"); - ATF_REQUIRE_EQ(words.size(), 1); - ATF_REQUIRE_EQ(words[0], " "); - - words = split(" ", "/"); - ATF_REQUIRE_EQ(words.size(), 1); - ATF_REQUIRE_EQ(words[0], " "); - - words = split("a/b", "/"); - ATF_REQUIRE_EQ(words.size(), 2); - ATF_REQUIRE_EQ(words[0], "a"); - ATF_REQUIRE_EQ(words[1], "b"); - - words = split("aLONGDELIMbcdLONGDELIMef", "LONGDELIM"); - ATF_REQUIRE_EQ(words.size(), 3); - ATF_REQUIRE_EQ(words[0], "a"); - ATF_REQUIRE_EQ(words[1], "bcd"); - ATF_REQUIRE_EQ(words[2], "ef"); -} - -ATF_TEST_CASE(trim); -ATF_TEST_CASE_HEAD(trim) -{ - set_md_var("descr", "Tests the trim function"); -} -ATF_TEST_CASE_BODY(trim) -{ - using tools::text::trim; - - ATF_REQUIRE_EQ(trim(""), ""); - ATF_REQUIRE_EQ(trim(" "), ""); - ATF_REQUIRE_EQ(trim("\t"), ""); - - ATF_REQUIRE_EQ(trim(" foo"), "foo"); - ATF_REQUIRE_EQ(trim("\t foo"), "foo"); - ATF_REQUIRE_EQ(trim(" \tfoo"), "foo"); - ATF_REQUIRE_EQ(trim("foo\t "), "foo"); - ATF_REQUIRE_EQ(trim("foo \t"), "foo"); - - ATF_REQUIRE_EQ(trim("foo bar"), "foo bar"); - ATF_REQUIRE_EQ(trim("\t foo bar"), "foo bar"); - ATF_REQUIRE_EQ(trim(" \tfoo bar"), "foo bar"); - ATF_REQUIRE_EQ(trim("foo bar\t "), "foo bar"); - ATF_REQUIRE_EQ(trim("foo bar \t"), "foo bar"); -} - -ATF_TEST_CASE(to_bool); -ATF_TEST_CASE_HEAD(to_bool) -{ - set_md_var("descr", "Tests the to_string function"); -} -ATF_TEST_CASE_BODY(to_bool) -{ - using tools::text::to_bool; - - ATF_REQUIRE(to_bool("true")); - ATF_REQUIRE(to_bool("TRUE")); - ATF_REQUIRE(to_bool("yes")); - ATF_REQUIRE(to_bool("YES")); - - ATF_REQUIRE(!to_bool("false")); - ATF_REQUIRE(!to_bool("FALSE")); - ATF_REQUIRE(!to_bool("no")); - ATF_REQUIRE(!to_bool("NO")); - - ATF_REQUIRE_THROW(std::runtime_error, to_bool("")); - ATF_REQUIRE_THROW(std::runtime_error, to_bool("tru")); - ATF_REQUIRE_THROW(std::runtime_error, to_bool("true2")); - ATF_REQUIRE_THROW(std::runtime_error, to_bool("fals")); - ATF_REQUIRE_THROW(std::runtime_error, to_bool("false2")); -} - -ATF_TEST_CASE(to_bytes); -ATF_TEST_CASE_HEAD(to_bytes) -{ - set_md_var("descr", "Tests the to_bytes function"); -} -ATF_TEST_CASE_BODY(to_bytes) -{ - using tools::text::to_bytes; - - ATF_REQUIRE_EQ(0, to_bytes("0")); - ATF_REQUIRE_EQ(12345, to_bytes("12345")); - ATF_REQUIRE_EQ(2 * 1024, to_bytes("2k")); - ATF_REQUIRE_EQ(4 * 1024 * 1024, to_bytes("4m")); - ATF_REQUIRE_EQ(int64_t(8) * 1024 * 1024 * 1024, to_bytes("8g")); - ATF_REQUIRE_EQ(int64_t(16) * 1024 * 1024 * 1024 * 1024, to_bytes("16t")); - - ATF_REQUIRE_THROW_RE(std::runtime_error, "Empty", to_bytes("")); - ATF_REQUIRE_THROW_RE(std::runtime_error, "Unknown size unit 'd'", - to_bytes("12d")); - ATF_REQUIRE_THROW(std::runtime_error, to_bytes(" ")); - ATF_REQUIRE_THROW(std::runtime_error, to_bytes(" k")); -} - -ATF_TEST_CASE(to_string); -ATF_TEST_CASE_HEAD(to_string) -{ - set_md_var("descr", "Tests the to_string function"); -} -ATF_TEST_CASE_BODY(to_string) -{ - using tools::text::to_string; - - ATF_REQUIRE_EQ(to_string('a'), "a"); - ATF_REQUIRE_EQ(to_string("a"), "a"); - ATF_REQUIRE_EQ(to_string(5), "5"); -} - -ATF_TEST_CASE(to_type); -ATF_TEST_CASE_HEAD(to_type) -{ - set_md_var("descr", "Tests the to_type function"); -} -ATF_TEST_CASE_BODY(to_type) -{ - using tools::text::to_type; - - ATF_REQUIRE_EQ(to_type< int >("0"), 0); - ATF_REQUIRE_EQ(to_type< int >("1234"), 1234); - ATF_REQUIRE_THROW(std::runtime_error, to_type< int >(" ")); - ATF_REQUIRE_THROW(std::runtime_error, to_type< int >("0 a")); - ATF_REQUIRE_THROW(std::runtime_error, to_type< int >("a")); - - ATF_REQUIRE_EQ(to_type< float >("0.5"), 0.5); - ATF_REQUIRE_EQ(to_type< float >("1234.5"), 1234.5); - ATF_REQUIRE_THROW(std::runtime_error, to_type< float >("0.5 a")); - ATF_REQUIRE_THROW(std::runtime_error, to_type< float >("a")); - - ATF_REQUIRE_EQ(to_type< std::string >("a"), "a"); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the test cases for the free functions. - ATF_ADD_TEST_CASE(tcs, duplicate); - ATF_ADD_TEST_CASE(tcs, join); - ATF_ADD_TEST_CASE(tcs, match); - ATF_ADD_TEST_CASE(tcs, split); - ATF_ADD_TEST_CASE(tcs, split_delims); - ATF_ADD_TEST_CASE(tcs, trim); - ATF_ADD_TEST_CASE(tcs, to_bool); - ATF_ADD_TEST_CASE(tcs, to_bytes); - ATF_ADD_TEST_CASE(tcs, to_string); - ATF_ADD_TEST_CASE(tcs, to_type); -} diff --git a/tools/timers.cpp b/tools/timers.cpp deleted file mode 100644 index 371a416aa2b1..000000000000 --- a/tools/timers.cpp +++ /dev/null @@ -1,211 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if defined(HAVE_CONFIG_H) -# include -#endif - -extern "C" { -#include -} - -#include -#include -#include -#include - -#include "defs.hpp" -#include "exceptions.hpp" -#include "signals.hpp" -#include "timers.hpp" - -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 ATF_DEFS_ATTRIBUTE_UNUSED, siginfo_t* si, - void* uc ATF_DEFS_ATTRIBUTE_UNUSED) -{ - impl::timer* timer = static_cast< impl::timer* >(si->si_value.sival_ptr); - timer->set_fired(); - timer->timeout_callback(); -} -#else -static -void -handler(const int signo ATF_DEFS_ATTRIBUTE_UNUSED, - siginfo_t* si ATF_DEFS_ATTRIBUTE_UNUSED, - void* uc ATF_DEFS_ATTRIBUTE_UNUSED) -{ - compat_handle->set_fired(); - compat_handle->timeout_callback(); -} -#endif - -// ------------------------------------------------------------------------ -// The "timer" class. -// ------------------------------------------------------------------------ - -struct impl::timer::impl { -#if defined(HAVE_TIMER_T) - ::timer_t m_timer; - ::itimerspec m_old_it; -#else - ::itimerval m_old_it; -#endif - - struct ::sigaction m_old_sa; - volatile bool m_fired; - - impl(void) : m_fired(false) - { - } -}; - -impl::timer::timer(const unsigned int seconds) : - m_pimpl(new impl()) -{ - struct ::sigaction sa; - sigemptyset(&sa.sa_mask); - sa.sa_flags = SA_SIGINFO; - sa.sa_sigaction = ::handler; - if (::sigaction(SIGALRM, &sa, &m_pimpl->m_old_sa) == -1) - throw tools::system_error(IMPL_NAME "::timer::timer", - "Failed to set signal handler", errno); - -#if defined(HAVE_TIMER_T) - struct ::sigevent se; - se.sigev_notify = SIGEV_SIGNAL; - se.sigev_signo = SIGALRM; - se.sigev_value.sival_ptr = static_cast< void* >(this); - se.sigev_notify_function = NULL; - se.sigev_notify_attributes = NULL; - if (::timer_create(CLOCK_MONOTONIC, &se, &m_pimpl->m_timer) == -1) { - ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL); - throw tools::system_error(IMPL_NAME "::timer::timer", - "Failed to create timer", errno); - } - - struct ::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_pimpl->m_timer, 0, &it, &m_pimpl->m_old_it) == -1) { - ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL); - ::timer_delete(m_pimpl->m_timer); - throw tools::system_error(IMPL_NAME "::timer::timer", - "Failed to program timer", errno); - } -#else - ::itimerval it; - 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, &m_pimpl->m_old_it) == -1) { - ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL); - throw tools::system_error(IMPL_NAME "::timer::timer", - "Failed to program timer", errno); - } - assert(compat_handle == NULL); - compat_handle = this; -#endif -} - -impl::timer::~timer(void) -{ -#if defined(HAVE_TIMER_T) - { - const int ret = ::timer_delete(m_pimpl->m_timer); - assert(ret != -1); - } -#else - { - const int ret = ::setitimer(ITIMER_REAL, &m_pimpl->m_old_it, NULL); - assert(ret != -1); - } -#endif - const int ret = ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL); - assert(ret != -1); - -#if !defined(HAVE_TIMER_T) - compat_handle = NULL; -#endif -} - -bool -impl::timer::fired(void) - const -{ - return m_pimpl->m_fired; -} - -void -impl::timer::set_fired(void) -{ - m_pimpl->m_fired = true; -} - -// ------------------------------------------------------------------------ -// The "child_timer" class. -// ------------------------------------------------------------------------ - -impl::child_timer::child_timer(const unsigned int seconds, const pid_t pid, - volatile bool& terminate) : - timer(seconds), - m_pid(pid), - m_terminate(terminate) -{ -} - -impl::child_timer::~child_timer(void) -{ -} - -void -impl::child_timer::timeout_callback(void) -{ - static const timespec ts = { 1, 0 }; - m_terminate = true; - ::kill(-m_pid, SIGTERM); - ::nanosleep(&ts, NULL); - if (::kill(-m_pid, 0) != -1) - ::kill(-m_pid, SIGKILL); -} diff --git a/tools/timers.hpp b/tools/timers.hpp deleted file mode 100644 index bf43ffb03f58..000000000000 --- a/tools/timers.hpp +++ /dev/null @@ -1,83 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2010 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_TIMERS_HPP) -#define TOOLS_TIMERS_HPP - -extern "C" { -#include -} - -#include - -namespace tools { -namespace timers { - -class signal_programmer; - -// ------------------------------------------------------------------------ -// The "timer" class. -// ------------------------------------------------------------------------ - -class timer { - // Non-copyable. - timer(const timer&); - timer& operator=(const timer&); - - struct impl; - std::auto_ptr< impl > m_pimpl; - -public: - timer(const unsigned int); - virtual ~timer(void); - - bool fired(void) const; - void set_fired(void); - virtual void timeout_callback(void) = 0; -}; - -// ------------------------------------------------------------------------ -// The "child_timer" class. -// ------------------------------------------------------------------------ - -class child_timer : public timer { - const pid_t m_pid; - volatile bool& m_terminate; - -public: - child_timer(const unsigned int, const pid_t, volatile bool&); - virtual ~child_timer(void); - - void timeout_callback(void); -}; - -} // namespace timers -} // namespace tools - -#endif // !defined(TOOLS_TIMERS_HPP) diff --git a/tools/ui.cpp b/tools/ui.cpp deleted file mode 100644 index 56426ec4863d..000000000000 --- a/tools/ui.cpp +++ /dev/null @@ -1,172 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include - -#include -#include -} - -#include -#include - -#include "env.hpp" -#include "text.hpp" -#include "ui.hpp" - -namespace impl = tools::ui; -#define IMPL_NAME "tools::ui" - -static -size_t -terminal_width(void) -{ - static bool done = false; - static size_t width = 0; - - if (!done) { - if (tools::env::has("COLUMNS")) { - const std::string cols = tools::env::get("COLUMNS"); - if (cols.length() > 0) { - width = tools::text::to_type< size_t >(cols); - } - } else { - struct winsize ws; - if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1) - width = ws.ws_col; - } - - if (width >= 80) - width -= 5; - - done = true; - } - - return width; -} - -static -std::string -format_paragraph(const std::string& text, - const std::string& tag, - const bool first, - const bool repeat, - const size_t col) -{ - assert(text.find('\n') == std::string::npos); - - const std::string pad(col - tag.length(), ' '); - const std::string fullpad(col, ' '); - - std::string formatted; - if (first || repeat) - formatted = tag + pad; - else - formatted = fullpad; - assert(formatted.length() == col); - size_t curcol = col; - - const size_t maxcol = terminal_width(); - - std::vector< std::string > words = tools::text::split(text, " "); - for (std::vector< std::string >::const_iterator iter = words.begin(); - iter != words.end(); iter++) { - const std::string& word = *iter; - - if (iter != words.begin() && maxcol > 0 && - curcol + word.length() + 1 > maxcol) { - if (repeat) - formatted += '\n' + tag + pad; - else - formatted += '\n' + fullpad; - curcol = col; - } else if (iter != words.begin()) { - formatted += ' '; - curcol++; - } - - formatted += word; - curcol += word.length(); - } - - return formatted; -} - -std::string -impl::format_error(const std::string& prog_name, const std::string& error) -{ - return format_text_with_tag("ERROR: " + error, prog_name + ": ", true); -} - -std::string -impl::format_info(const std::string& prog_name, const std::string& msg) -{ - return format_text_with_tag(msg, prog_name + ": ", true); -} - -std::string -impl::format_text(const std::string& text) -{ - return format_text_with_tag(text, "", false, 0); -} - -std::string -impl::format_text_with_tag(const std::string& text, const std::string& tag, - bool repeat, size_t col) -{ - assert(col == 0 || col >= tag.length()); - if (col == 0) - col = tag.length(); - - std::string formatted; - - std::vector< std::string > lines = tools::text::split(text, "\n"); - for (std::vector< std::string >::const_iterator iter = lines.begin(); - iter != lines.end(); iter++) { - const std::string& line = *iter; - - formatted += format_paragraph(line, tag, iter == lines.begin(), - repeat, col); - if (iter + 1 != lines.end()) { - if (repeat) - formatted += "\n" + tag + "\n"; - else - formatted += "\n\n"; - } - } - - return formatted; -} - -std::string -impl::format_warning(const std::string& prog_name, const std::string& error) -{ - return format_text_with_tag("WARNING: " + error, prog_name + ": ", true); -} diff --git a/tools/ui.hpp b/tools/ui.hpp deleted file mode 100644 index 4e0e4318be96..000000000000 --- a/tools/ui.hpp +++ /dev/null @@ -1,105 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_UI_HPP) -#define TOOLS_UI_HPP - -#include - -namespace tools { -namespace ui { - -//! -//! \brief Formats an error message to fit on screen. -//! -//! Given the program's name and an error message, properly formats it to -//! fit on screen. -//! -//! The program's name is not stored globally to prevent the usage of this -//! function from inside the library. Making it a explicit parameter -//! restricts its usage to the frontend. -//! -std::string format_error(const std::string&, const std::string&); - -//! -//! \brief Formats an informational message to fit on screen. -//! -//! Given the program's name and an informational message, properly formats -//! it to fit on screen. -//! -//! The program's name is not stored globally to prevent the usage of this -//! function from inside the library. Making it a explicit parameter -//! restricts its usage to the frontend. -//! -std::string format_info(const std::string&, const std::string&); - -//! -//! \brief Formats a block of text to fit nicely on screen. -//! -//! Given a text, which is composed of multiple paragraphs separated by -//! a single '\n' character, reformats it to fill on the current screen's -//! width with proper line wrapping. -//! -//! This is just a special case of format_text_with_tag, provided for -//! simplicity. -//! -std::string format_text(const std::string&); - -//! -//! \brief Formats a block of text to fit nicely on screen, prepending a -//! tag to it. -//! -//! Given a text, which is composed of multiple paragraphs separated by -//! a single '\n' character, reformats it to fill on the current screen's -//! width with proper line wrapping. The text is prepended with a tag; -//! i.e. a word that is printed at the beginning of the first paragraph and -//! optionally repeated at the beginning of each word. The last parameter -//! specifies the column on which the text should start, and that position -//! must be greater than the tag's length or 0, in which case it -//! automatically takes the correct value. -//! -std::string format_text_with_tag(const std::string&, const std::string&, - bool, size_t = 0); - -//! -//! \brief Formats a warning message to fit on screen. -//! -//! Given the program's name and a warning message, properly formats it to -//! fit on screen. -//! -//! The program's name is not stored globally to prevent the usage of this -//! function from inside the library. Making it a explicit parameter -//! restricts its usage to the frontend. -//! -std::string format_warning(const std::string&, const std::string&); - -} // namespace ui -} // namespace tools - -#endif // !defined(TOOLS_UI_HPP) diff --git a/tools/ui_test.cpp b/tools/ui_test.cpp deleted file mode 100644 index e4d9050eab9e..000000000000 --- a/tools/ui_test.cpp +++ /dev/null @@ -1,462 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2009 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#include -#include - -#include - -#include "env.hpp" -#include "ui.hpp" - -// ------------------------------------------------------------------------ -// Test cases for the free functions. -// ------------------------------------------------------------------------ - -struct test { - const char *tc; - const char *tag; - bool repeat; - size_t col; - const char *fmt; - const char *result; -} tests[] = { - // - // wo_tag - // - - { - "wo_tag", - "", - false, - 0, - "12345", - "12345", - }, - - { - "wo_tag", - "", - false, - 0, - "12345 ", - "12345", - }, - - { - "wo_tag", - "", - false, - 0, - "12345 7890", - "12345 7890", - }, - - { - "wo_tag", - "", - false, - 0, - "12345 789012 45", - "12345 789012 45", - }, - - { - "wo_tag", - "", - false, - 0, - "12345 789012 456", - "12345 789012\n456", - }, - - { - "wo_tag", - "", - false, - 0, - "1234567890123456", - "1234567890123456", - }, - - // TODO(jmmv): Fix the code to pass this test... -// { -// "wo_tag", -// "", -// false, -// 0, -// " 2345678901234567", -// "\n2345678901234567", -// }, - - { - "wo_tag", - "", - false, - 0, - "12345 789012345 78", - "12345 789012345\n78", - }, - - // - // wo_tag_col - // - - { - "wo_tag_col", - "", - false, - 10, - "12345", - " 12345", - }, - - { - "wo_tag_col", - "", - false, - 10, - "12345 7890", - " 12345\n" - " 7890", - }, - - { - "wo_tag_col", - "", - false, - 10, - "1 3 5 7 9", - " 1 3 5\n" - " 7 9", - }, - - // - // w_tag_no_repeat - // - - { - "w_tag_no_repeat", - "1234: ", - false, - 0, - "789012345", - "1234: 789012345", - }, - - { - "w_tag_no_repeat", - "1234: ", - false, - 0, - "789 1234 56789", - "1234: 789 1234\n" - " 56789", - }, - - { - "w_tag_no_repeat", - "1234: ", - false, - 0, - "789012345", - "1234: 789012345", - }, - - { - "w_tag_no_repeat", - "1234: ", - false, - 0, - "789012345 7890", - "1234: 789012345\n" - " 7890", - }, - - // - // w_tag_repeat - // - - { - "w_tag_repeat", - "1234: ", - true, - 0, - "789012345", - "1234: 789012345", - }, - - { - "w_tag_repeat", - "1234: ", - true, - 0, - "789 1234 56789", - "1234: 789 1234\n" - "1234: 56789", - }, - - { - "w_tag_repeat", - "1234: ", - true, - 0, - "789012345", - "1234: 789012345", - }, - - { - "w_tag_no_repeat", - "1234: ", - true, - 0, - "789012345 7890", - "1234: 789012345\n" - "1234: 7890", - }, - - // - // w_tag_col - // - - { - "w_tag_col", - "1234:", - false, - 10, - "1 3 5", - "1234: 1 3 5", - }, - - { - "w_tag_col", - "1234:", - false, - 10, - "1 3 5 7 9", - "1234: 1 3 5\n" - " 7 9", - }, - - { - "w_tag_col", - "1234:", - true, - 10, - "1 3 5 7 9", - "1234: 1 3 5\n" - "1234: 7 9", - }, - - // - // paragraphs - // - - { - "paragraphs", - "", - false, - 0, - "1 3 5\n\n", - "1 3 5" - }, - - { - "paragraphs", - "", - false, - 0, - "1 3 5\n2 4 6", - "1 3 5\n\n2 4 6" - }, - - { - "paragraphs", - "", - false, - 0, - "1234 6789 123456\n2 4 6", - "1234 6789\n123456\n\n2 4 6" - }, - - { - "paragraphs", - "12: ", - false, - 0, - "56789 123456\n2 4 6", - "12: 56789\n 123456\n\n 2 4 6" - }, - - { - "paragraphs", - "12: ", - true, - 0, - "56789 123456\n2 4 6", - "12: 56789\n12: 123456\n12: \n12: 2 4 6" - }, - - { - "paragraphs", - "12:", - false, - 4, - "56789 123456\n2 4 6", - "12: 56789\n 123456\n\n 2 4 6" - }, - - { - "paragraphs", - "12:", - true, - 4, - "56789 123456\n2 4 6", - "12: 56789\n12: 123456\n12:\n12: 2 4 6" - }, - - // - // end - // - - { - NULL, - NULL, - false, - 0, - NULL, - NULL, - }, -}; - -static -void -run_tests(const char *tc) -{ - struct test *t; - - std::cout << "Running tests for " << tc << "\n"; - - tools::env::set("COLUMNS", "15"); - - for (t = &tests[0]; t->tc != NULL; t++) { - if (std::strcmp(t->tc, tc) == 0) { - std::cout << "\n"; - std::cout << "Testing with tag '" << t->tag << "', '" - << (t->repeat ? "repeat" : "no repeat") << "', col " - << t->col << "\n"; - std::cout << "Input: >>>" << t->fmt << "<<<\n"; - std::cout << "Expected output: >>>" << t->result << "<<<\n"; - - std::string result = tools::ui::format_text_with_tag(t->fmt, t->tag, - t->repeat, t->col); - std::cout << "Output : >>>" << result << "<<<\n"; - ATF_REQUIRE_EQ(t->result, result); - } - } -} - -ATF_TEST_CASE(wo_tag); -ATF_TEST_CASE_HEAD(wo_tag) -{ - set_md_var("descr", "Checks formatting without tags"); -} -ATF_TEST_CASE_BODY(wo_tag) -{ - run_tests("wo_tag"); -} - -ATF_TEST_CASE(wo_tag_col); -ATF_TEST_CASE_HEAD(wo_tag_col) -{ - set_md_var("descr", "Checks formatting without tags and with a non-zero " - "starting column"); -} -ATF_TEST_CASE_BODY(wo_tag_col) -{ - run_tests("wo_tag_col"); -} - -ATF_TEST_CASE(w_tag_no_repeat); -ATF_TEST_CASE_HEAD(w_tag_no_repeat) -{ - set_md_var("descr", "Checks formatting with a tag"); -} -ATF_TEST_CASE_BODY(w_tag_no_repeat) -{ - run_tests("w_tag_no_repeat"); -} - -ATF_TEST_CASE(w_tag_repeat); -ATF_TEST_CASE_HEAD(w_tag_repeat) -{ - set_md_var("descr", "Checks formatting with a tag and repeating it on " - "each line"); -} -ATF_TEST_CASE_BODY(w_tag_repeat) -{ - run_tests("w_tag_repeat"); -} - -ATF_TEST_CASE(w_tag_col); -ATF_TEST_CASE_HEAD(w_tag_col) -{ - set_md_var("descr", "Checks formatting with a tag and starting at a " - "column greater than its length"); -} -ATF_TEST_CASE_BODY(w_tag_col) -{ - run_tests("w_tag_col"); -} - -ATF_TEST_CASE(paragraphs); -ATF_TEST_CASE_HEAD(paragraphs) -{ - set_md_var("descr", "Checks formatting a string that contains multiple " - "paragraphs"); -} -ATF_TEST_CASE_BODY(paragraphs) -{ - run_tests("paragraphs"); -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the test cases for the free functions. - ATF_ADD_TEST_CASE(tcs, wo_tag); - ATF_ADD_TEST_CASE(tcs, wo_tag_col); - ATF_ADD_TEST_CASE(tcs, w_tag_no_repeat); - ATF_ADD_TEST_CASE(tcs, w_tag_repeat); - ATF_ADD_TEST_CASE(tcs, w_tag_col); - ATF_ADD_TEST_CASE(tcs, paragraphs); -} diff --git a/tools/user.cpp b/tools/user.cpp deleted file mode 100644 index 85d7e501d10a..000000000000 --- a/tools/user.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include - -#include -#include -#include -} - -#include -#include -#include - -#include "user.hpp" - -namespace impl = tools::user; -#define IMPL_NAME "tools::user" - -uid_t -impl::euid(void) -{ - return ::geteuid(); -} - -void -impl::drop_privileges(const std::pair< int, int > ids) -{ - if (::setgid(ids.second) == -1) - throw std::runtime_error("Failed to drop group privileges"); - if (::setuid(ids.first) == -1) - throw std::runtime_error("Failed to drop user privileges"); -} - -std::pair< int, int > -impl::get_user_ids(const std::string& user) -{ - const struct passwd* pw = ::getpwnam(user.c_str()); - if (pw == NULL) - throw std::runtime_error("Failed to get information for user " + user); - return std::make_pair(pw->pw_uid, pw->pw_gid); -} - -bool -impl::is_member_of_group(gid_t gid) -{ - static gid_t groups[NGROUPS_MAX]; - static int ngroups = -1; - bool found; - int i; - - if (ngroups == -1) { - ngroups = getgroups(NGROUPS_MAX, groups); - assert(ngroups >= 0); - } - - found = false; - for (i = 0; !found && i < ngroups; i++) - if (groups[i] == gid) - found = true; - return found; -} - -bool -impl::is_root(void) -{ - return ::geteuid() == 0; -} - -bool -impl::is_unprivileged(void) -{ - return ::geteuid() != 0; -} diff --git a/tools/user.hpp b/tools/user.hpp deleted file mode 100644 index 1758eb01a543..000000000000 --- a/tools/user.hpp +++ /dev/null @@ -1,52 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -#if !defined(TOOLS_USER_HPP) -#define TOOLS_USER_HPP - -extern "C" { -#include -} - -#include - -namespace tools { -namespace user { - -uid_t euid(void); -void drop_privileges(const std::pair< int, int >); -std::pair< int, int > get_user_ids(const std::string&); -bool is_member_of_group(gid_t); -bool is_root(void); -bool is_unprivileged(void); - -} // namespace user -} // namespace tools - -#endif // !defined(TOOLS_USER_HPP) diff --git a/tools/user_test.cpp b/tools/user_test.cpp deleted file mode 100644 index 4c385d311ee8..000000000000 --- a/tools/user_test.cpp +++ /dev/null @@ -1,148 +0,0 @@ -// -// Automated Testing Framework (atf) -// -// Copyright (c) 2007 The NetBSD Foundation, Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -extern "C" { -#include -#include -#include -#include -} - -#include -#include - -#include - -#include "user.hpp" - -// ------------------------------------------------------------------------ -// Test cases for the free functions. -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(euid); -ATF_TEST_CASE_HEAD(euid) -{ - set_md_var("descr", "Tests the euid function"); -} -ATF_TEST_CASE_BODY(euid) -{ - using tools::user::euid; - - ATF_REQUIRE_EQ(euid(), ::geteuid()); -} - -ATF_TEST_CASE(is_member_of_group); -ATF_TEST_CASE_HEAD(is_member_of_group) -{ - set_md_var("descr", "Tests the is_member_of_group function"); -} -ATF_TEST_CASE_BODY(is_member_of_group) -{ - using tools::user::is_member_of_group; - - std::set< gid_t > groups; - gid_t maxgid = 0; - { - gid_t gids[NGROUPS_MAX]; - int ngids = ::getgroups(NGROUPS_MAX, gids); - if (ngids == -1) - ATF_FAIL("Call to ::getgroups failed"); - for (int i = 0; i < ngids; i++) { - groups.insert(gids[i]); - if (gids[i] > maxgid) - maxgid = gids[i]; - } - std::cout << "User belongs to " << ngids << " groups\n"; - std::cout << "Last GID is " << maxgid << "\n"; - } - - const gid_t maxgid_limit = 1 << 16; - if (maxgid > maxgid_limit) { - std::cout << "Test truncated from " << maxgid << " groups to " - << maxgid_limit << " to keep the run time reasonable " - "enough\n"; - maxgid = maxgid_limit; - } - - for (gid_t g = 0; g <= maxgid; g++) { - if (groups.find(g) == groups.end()) { - std::cout << "Checking if user does not belong to group " - << g << "\n"; - ATF_REQUIRE(!is_member_of_group(g)); - } else { - std::cout << "Checking if user belongs to group " << g << "\n"; - ATF_REQUIRE(is_member_of_group(g)); - } - } -} - -ATF_TEST_CASE(is_root); -ATF_TEST_CASE_HEAD(is_root) -{ - set_md_var("descr", "Tests the is_root function"); -} -ATF_TEST_CASE_BODY(is_root) -{ - using tools::user::is_root; - - if (::geteuid() == 0) { - ATF_REQUIRE(is_root()); - } else { - ATF_REQUIRE(!is_root()); - } -} - -ATF_TEST_CASE(is_unprivileged); -ATF_TEST_CASE_HEAD(is_unprivileged) -{ - set_md_var("descr", "Tests the is_unprivileged function"); -} -ATF_TEST_CASE_BODY(is_unprivileged) -{ - using tools::user::is_unprivileged; - - if (::geteuid() != 0) { - ATF_REQUIRE(is_unprivileged()); - } else { - ATF_REQUIRE(!is_unprivileged()); - } -} - -// ------------------------------------------------------------------------ -// Main. -// ------------------------------------------------------------------------ - -ATF_INIT_TEST_CASES(tcs) -{ - // Add the tests for the free functions. - ATF_ADD_TEST_CASE(tcs, euid); - ATF_ADD_TEST_CASE(tcs, is_member_of_group); - ATF_ADD_TEST_CASE(tcs, is_root); - ATF_ADD_TEST_CASE(tcs, is_unprivileged); -} diff --git a/tools/zero_tcs_helper.c b/tools/zero_tcs_helper.c deleted file mode 100644 index d4068b17a838..000000000000 --- a/tools/zero_tcs_helper.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Automated Testing Framework (atf) - * - * Copyright (c) 2010 The NetBSD Foundation, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include - -ATF_TP_ADD_TCS(tp) -{ - if (tp != NULL) {} /* Use tp. */ - return atf_no_error(); -}