From b1f69da795603c43bcafaeb4c4324a59449f85c8 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Sat, 25 Jan 2025 23:55:57 +0100 Subject: [PATCH] #934: Unify test directories (#939) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There really wasn't much point to having "unit" tests and story tests ("legacy" tests, really) in separate directories. Sweep them all together into a single directory — it's simpler, and possibly faster on some build systems. --- src/strconv.cxx | 7 +- test/CMakeLists.txt | 2 +- test/Makefile.am | 88 +-- test/Makefile.am.template | 3 - test/Makefile.in | 572 +++++++----------- test/{unit => }/test_array.cxx | 2 +- test/{unit => }/test_blob.cxx | 4 +- test/{unit => }/test_cancel_query.cxx | 2 +- test/{unit => }/test_column.cxx | 2 +- test/{unit => }/test_composite.cxx | 2 +- test/{unit => }/test_connection.cxx | 2 +- test/{unit => }/test_cursor.cxx | 2 +- test/{unit => }/test_encodings.cxx | 2 +- test/{unit => }/test_error_verbosity.cxx | 2 +- test/{unit => }/test_errorhandler.cxx | 2 +- test/{unit => }/test_escape.cxx | 2 +- test/{unit => }/test_exceptions.cxx | 2 +- test/{unit => }/test_field.cxx | 2 +- test/{unit => }/test_float.cxx | 2 +- test/{unit => }/test_largeobject.cxx | 2 +- test/{unit => }/test_nonblocking_connect.cxx | 2 +- test/{unit => }/test_notice_handler.cxx | 2 +- test/{unit => }/test_notification.cxx | 2 +- test/{unit => }/test_pipeline.cxx | 2 +- test/{unit => }/test_prepared_statement.cxx | 2 +- test/{unit => }/test_range.cxx | 2 +- test/{unit => }/test_read_transaction.cxx | 2 +- test/{unit => }/test_result_iteration.cxx | 2 +- test/{unit => }/test_row.cxx | 2 +- test/{unit => }/test_separated_list.cxx | 2 +- .../test_simultaneous_transactions.cxx | 2 +- test/{unit => }/test_sql_cursor.cxx | 2 +- test/{unit => }/test_stateless_cursor.cxx | 2 +- test/{unit => }/test_strconv.cxx | 2 +- test/{unit => }/test_stream_from.cxx | 4 +- test/{unit => }/test_stream_query.cxx | 4 +- test/{unit => }/test_stream_to.cxx | 4 +- test/{unit => }/test_string_conversion.cxx | 2 +- test/{unit => }/test_subtransaction.cxx | 2 +- test/{unit => }/test_test_helpers.cxx | 2 +- test/{unit => }/test_thread_safety_model.cxx | 2 +- test/{unit => }/test_time.cxx | 2 +- test/{unit => }/test_transaction.cxx | 2 +- test/{unit => }/test_transaction_base.cxx | 2 +- test/{unit => }/test_transaction_focus.cxx | 2 +- test/{unit => }/test_transactor.cxx | 2 +- test/{unit => }/test_type_name.cxx | 2 +- test/{unit => }/test_util.cxx | 2 +- test/{unit => }/test_zview.cxx | 2 +- test/unit/CMakeLists.txt | 14 - 50 files changed, 325 insertions(+), 457 deletions(-) rename test/{unit => }/test_array.cxx (99%) rename test/{unit => }/test_blob.cxx (99%) rename test/{unit => }/test_cancel_query.cxx (94%) rename test/{unit => }/test_column.cxx (98%) rename test/{unit => }/test_composite.cxx (98%) rename test/{unit => }/test_connection.cxx (99%) rename test/{unit => }/test_cursor.cxx (97%) rename test/{unit => }/test_encodings.cxx (99%) rename test/{unit => }/test_error_verbosity.cxx (96%) rename test/{unit => }/test_errorhandler.cxx (99%) rename test/{unit => }/test_escape.cxx (99%) rename test/{unit => }/test_exceptions.cxx (96%) rename test/{unit => }/test_field.cxx (98%) rename test/{unit => }/test_float.cxx (99%) rename test/{unit => }/test_largeobject.cxx (98%) rename test/{unit => }/test_nonblocking_connect.cxx (94%) rename test/{unit => }/test_notice_handler.cxx (99%) rename test/{unit => }/test_notification.cxx (99%) rename test/{unit => }/test_pipeline.cxx (98%) rename test/{unit => }/test_prepared_statement.cxx (99%) rename test/{unit => }/test_range.cxx (99%) rename test/{unit => }/test_read_transaction.cxx (93%) rename test/{unit => }/test_result_iteration.cxx (99%) rename test/{unit => }/test_row.cxx (99%) rename test/{unit => }/test_separated_list.cxx (96%) rename test/{unit => }/test_simultaneous_transactions.cxx (92%) rename test/{unit => }/test_sql_cursor.cxx (99%) rename test/{unit => }/test_stateless_cursor.cxx (99%) rename test/{unit => }/test_strconv.cxx (99%) rename test/{unit => }/test_stream_from.cxx (99%) rename test/{unit => }/test_stream_query.cxx (99%) rename test/{unit => }/test_stream_to.cxx (99%) rename test/{unit => }/test_string_conversion.cxx (99%) rename test/{unit => }/test_subtransaction.cxx (98%) rename test/{unit => }/test_test_helpers.cxx (99%) rename test/{unit => }/test_thread_safety_model.cxx (93%) rename test/{unit => }/test_time.cxx (98%) rename test/{unit => }/test_transaction.cxx (98%) rename test/{unit => }/test_transaction_base.cxx (99%) rename test/{unit => }/test_transaction_focus.cxx (97%) rename test/{unit => }/test_transactor.cxx (99%) rename test/{unit => }/test_type_name.cxx (94%) rename test/{unit => }/test_util.cxx (96%) rename test/{unit => }/test_zview.cxx (97%) delete mode 100644 test/unit/CMakeLists.txt diff --git a/src/strconv.cxx b/src/strconv.cxx index 7efbbcfd7..d12eb3a32 100644 --- a/src/strconv.cxx +++ b/src/strconv.cxx @@ -147,10 +147,9 @@ inline char *wrap_to_chars(char *begin, char *end, T const &value) namespace pqxx { template -inline - zview - // NOLINTNEXTLINE(readability-non-const-parameter) - string_traits::to_buf(char *begin, char *end, T const &value) +inline zview +// NOLINTNEXTLINE(readability-non-const-parameter) +string_traits::to_buf(char *begin, char *end, T const &value) { static_assert(std::is_integral_v); auto const space{end - begin}, diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 331631145..562ea3e84 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT PostgreSQL_FOUND) find_package(PostgreSQL REQUIRED) endif() -file(GLOB TEST_SOURCES test*.cxx unit/test_*.cxx runner.cxx) +file(GLOB TEST_SOURCES *.cxx) add_executable(runner ${TEST_SOURCES}) target_link_libraries(runner PUBLIC pqxx) diff --git a/test/Makefile.am b/test/Makefile.am index 15e85b282..ce30386b0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -74,50 +74,50 @@ runner_SOURCES = \ test88.cxx \ test89.cxx \ test90.cxx \ - unit/test_array.cxx \ - unit/test_blob.cxx \ - unit/test_cancel_query.cxx \ - unit/test_column.cxx \ - unit/test_composite.cxx \ - unit/test_connection.cxx \ - unit/test_cursor.cxx \ - unit/test_encodings.cxx \ - unit/test_error_verbosity.cxx \ - unit/test_errorhandler.cxx \ - unit/test_escape.cxx \ - unit/test_exceptions.cxx \ - unit/test_field.cxx \ - unit/test_float.cxx \ - unit/test_largeobject.cxx \ - unit/test_nonblocking_connect.cxx \ - unit/test_notice_handler.cxx \ - unit/test_notification.cxx \ - unit/test_pipeline.cxx \ - unit/test_prepared_statement.cxx \ - unit/test_range.cxx \ - unit/test_read_transaction.cxx \ - unit/test_result_iteration.cxx \ - unit/test_row.cxx \ - unit/test_separated_list.cxx \ - unit/test_simultaneous_transactions.cxx \ - unit/test_sql_cursor.cxx \ - unit/test_stateless_cursor.cxx \ - unit/test_strconv.cxx \ - unit/test_stream_from.cxx \ - unit/test_stream_query.cxx \ - unit/test_stream_to.cxx \ - unit/test_string_conversion.cxx \ - unit/test_subtransaction.cxx \ - unit/test_test_helpers.cxx \ - unit/test_thread_safety_model.cxx \ - unit/test_time.cxx \ - unit/test_transaction.cxx \ - unit/test_transaction_base.cxx \ - unit/test_transaction_focus.cxx \ - unit/test_transactor.cxx \ - unit/test_type_name.cxx \ - unit/test_util.cxx \ - unit/test_zview.cxx \ + test_array.cxx \ + test_blob.cxx \ + test_cancel_query.cxx \ + test_column.cxx \ + test_composite.cxx \ + test_connection.cxx \ + test_cursor.cxx \ + test_encodings.cxx \ + test_error_verbosity.cxx \ + test_errorhandler.cxx \ + test_escape.cxx \ + test_exceptions.cxx \ + test_field.cxx \ + test_float.cxx \ + test_largeobject.cxx \ + test_nonblocking_connect.cxx \ + test_notice_handler.cxx \ + test_notification.cxx \ + test_pipeline.cxx \ + test_prepared_statement.cxx \ + test_range.cxx \ + test_read_transaction.cxx \ + test_result_iteration.cxx \ + test_row.cxx \ + test_separated_list.cxx \ + test_simultaneous_transactions.cxx \ + test_sql_cursor.cxx \ + test_stateless_cursor.cxx \ + test_strconv.cxx \ + test_stream_from.cxx \ + test_stream_query.cxx \ + test_stream_to.cxx \ + test_string_conversion.cxx \ + test_subtransaction.cxx \ + test_test_helpers.cxx \ + test_thread_safety_model.cxx \ + test_time.cxx \ + test_transaction.cxx \ + test_transaction_base.cxx \ + test_transaction_focus.cxx \ + test_transactor.cxx \ + test_type_name.cxx \ + test_util.cxx \ + test_zview.cxx \ runner.cxx runner_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB} diff --git a/test/Makefile.am.template b/test/Makefile.am.template index 2a21f6ef7..18028c6bd 100644 --- a/test/Makefile.am.template +++ b/test/Makefile.am.template @@ -26,9 +26,6 @@ MAINTAINERCLEANFILES=Makefile.in runner_SOURCES = \ ###MAKTEMPLATE:FOREACH test/test*.cxx ###BASENAME###.cxx \ -###MAKTEMPLATE:ENDFOREACH -###MAKTEMPLATE:FOREACH test/unit/test_*.cxx - unit/###BASENAME###.cxx \ ###MAKTEMPLATE:ENDFOREACH runner.cxx diff --git a/test/Makefile.in b/test/Makefile.in index ce7be9f4c..43355ebde 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -124,7 +124,6 @@ CONFIG_HEADER = $(top_builddir)/include/pqxx/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = runner$(EXEEXT) -am__dirstamp = $(am__leading_dot)dirstamp am_runner_OBJECTS = test00.$(OBJEXT) test01.$(OBJEXT) test02.$(OBJEXT) \ test07.$(OBJEXT) test10.$(OBJEXT) test11.$(OBJEXT) \ test13.$(OBJEXT) test14.$(OBJEXT) test16.$(OBJEXT) \ @@ -137,37 +136,30 @@ am_runner_OBJECTS = test00.$(OBJEXT) test01.$(OBJEXT) test02.$(OBJEXT) \ test72.$(OBJEXT) test74.$(OBJEXT) test75.$(OBJEXT) \ test76.$(OBJEXT) test77.$(OBJEXT) test82.$(OBJEXT) \ test84.$(OBJEXT) test88.$(OBJEXT) test89.$(OBJEXT) \ - test90.$(OBJEXT) unit/test_array.$(OBJEXT) \ - unit/test_blob.$(OBJEXT) unit/test_cancel_query.$(OBJEXT) \ - unit/test_column.$(OBJEXT) unit/test_composite.$(OBJEXT) \ - unit/test_connection.$(OBJEXT) unit/test_cursor.$(OBJEXT) \ - unit/test_encodings.$(OBJEXT) \ - unit/test_error_verbosity.$(OBJEXT) \ - unit/test_errorhandler.$(OBJEXT) unit/test_escape.$(OBJEXT) \ - unit/test_exceptions.$(OBJEXT) unit/test_field.$(OBJEXT) \ - unit/test_float.$(OBJEXT) unit/test_largeobject.$(OBJEXT) \ - unit/test_nonblocking_connect.$(OBJEXT) \ - unit/test_notice_handler.$(OBJEXT) \ - unit/test_notification.$(OBJEXT) unit/test_pipeline.$(OBJEXT) \ - unit/test_prepared_statement.$(OBJEXT) \ - unit/test_range.$(OBJEXT) unit/test_read_transaction.$(OBJEXT) \ - unit/test_result_iteration.$(OBJEXT) unit/test_row.$(OBJEXT) \ - unit/test_separated_list.$(OBJEXT) \ - unit/test_simultaneous_transactions.$(OBJEXT) \ - unit/test_sql_cursor.$(OBJEXT) \ - unit/test_stateless_cursor.$(OBJEXT) \ - unit/test_strconv.$(OBJEXT) unit/test_stream_from.$(OBJEXT) \ - unit/test_stream_query.$(OBJEXT) unit/test_stream_to.$(OBJEXT) \ - unit/test_string_conversion.$(OBJEXT) \ - unit/test_subtransaction.$(OBJEXT) \ - unit/test_test_helpers.$(OBJEXT) \ - unit/test_thread_safety_model.$(OBJEXT) \ - unit/test_time.$(OBJEXT) unit/test_transaction.$(OBJEXT) \ - unit/test_transaction_base.$(OBJEXT) \ - unit/test_transaction_focus.$(OBJEXT) \ - unit/test_transactor.$(OBJEXT) unit/test_type_name.$(OBJEXT) \ - unit/test_util.$(OBJEXT) unit/test_zview.$(OBJEXT) \ - runner.$(OBJEXT) + test90.$(OBJEXT) test_array.$(OBJEXT) test_blob.$(OBJEXT) \ + test_cancel_query.$(OBJEXT) test_column.$(OBJEXT) \ + test_composite.$(OBJEXT) test_connection.$(OBJEXT) \ + test_cursor.$(OBJEXT) test_encodings.$(OBJEXT) \ + test_error_verbosity.$(OBJEXT) test_errorhandler.$(OBJEXT) \ + test_escape.$(OBJEXT) test_exceptions.$(OBJEXT) \ + test_field.$(OBJEXT) test_float.$(OBJEXT) \ + test_largeobject.$(OBJEXT) test_nonblocking_connect.$(OBJEXT) \ + test_notice_handler.$(OBJEXT) test_notification.$(OBJEXT) \ + test_pipeline.$(OBJEXT) test_prepared_statement.$(OBJEXT) \ + test_range.$(OBJEXT) test_read_transaction.$(OBJEXT) \ + test_result_iteration.$(OBJEXT) test_row.$(OBJEXT) \ + test_separated_list.$(OBJEXT) \ + test_simultaneous_transactions.$(OBJEXT) \ + test_sql_cursor.$(OBJEXT) test_stateless_cursor.$(OBJEXT) \ + test_strconv.$(OBJEXT) test_stream_from.$(OBJEXT) \ + test_stream_query.$(OBJEXT) test_stream_to.$(OBJEXT) \ + test_string_conversion.$(OBJEXT) test_subtransaction.$(OBJEXT) \ + test_test_helpers.$(OBJEXT) test_thread_safety_model.$(OBJEXT) \ + test_time.$(OBJEXT) test_transaction.$(OBJEXT) \ + test_transaction_base.$(OBJEXT) \ + test_transaction_focus.$(OBJEXT) test_transactor.$(OBJEXT) \ + test_type_name.$(OBJEXT) test_util.$(OBJEXT) \ + test_zview.$(OBJEXT) runner.$(OBJEXT) runner_OBJECTS = $(am_runner_OBJECTS) runner_DEPENDENCIES = $(top_builddir)/src/libpqxx.la AM_V_lt = $(am__v_lt_@AM_V@) @@ -207,44 +199,35 @@ am__depfiles_remade = ./$(DEPDIR)/runner.Po ./$(DEPDIR)/test00.Po \ ./$(DEPDIR)/test77.Po ./$(DEPDIR)/test82.Po \ ./$(DEPDIR)/test84.Po ./$(DEPDIR)/test88.Po \ ./$(DEPDIR)/test89.Po ./$(DEPDIR)/test90.Po \ - unit/$(DEPDIR)/test_array.Po unit/$(DEPDIR)/test_blob.Po \ - unit/$(DEPDIR)/test_cancel_query.Po \ - unit/$(DEPDIR)/test_column.Po unit/$(DEPDIR)/test_composite.Po \ - unit/$(DEPDIR)/test_connection.Po \ - unit/$(DEPDIR)/test_cursor.Po unit/$(DEPDIR)/test_encodings.Po \ - unit/$(DEPDIR)/test_error_verbosity.Po \ - unit/$(DEPDIR)/test_errorhandler.Po \ - unit/$(DEPDIR)/test_escape.Po \ - unit/$(DEPDIR)/test_exceptions.Po unit/$(DEPDIR)/test_field.Po \ - unit/$(DEPDIR)/test_float.Po \ - unit/$(DEPDIR)/test_largeobject.Po \ - unit/$(DEPDIR)/test_nonblocking_connect.Po \ - unit/$(DEPDIR)/test_notice_handler.Po \ - unit/$(DEPDIR)/test_notification.Po \ - unit/$(DEPDIR)/test_pipeline.Po \ - unit/$(DEPDIR)/test_prepared_statement.Po \ - unit/$(DEPDIR)/test_range.Po \ - unit/$(DEPDIR)/test_read_transaction.Po \ - unit/$(DEPDIR)/test_result_iteration.Po \ - unit/$(DEPDIR)/test_row.Po \ - unit/$(DEPDIR)/test_separated_list.Po \ - unit/$(DEPDIR)/test_simultaneous_transactions.Po \ - unit/$(DEPDIR)/test_sql_cursor.Po \ - unit/$(DEPDIR)/test_stateless_cursor.Po \ - unit/$(DEPDIR)/test_strconv.Po \ - unit/$(DEPDIR)/test_stream_from.Po \ - unit/$(DEPDIR)/test_stream_query.Po \ - unit/$(DEPDIR)/test_stream_to.Po \ - unit/$(DEPDIR)/test_string_conversion.Po \ - unit/$(DEPDIR)/test_subtransaction.Po \ - unit/$(DEPDIR)/test_test_helpers.Po \ - unit/$(DEPDIR)/test_thread_safety_model.Po \ - unit/$(DEPDIR)/test_time.Po unit/$(DEPDIR)/test_transaction.Po \ - unit/$(DEPDIR)/test_transaction_base.Po \ - unit/$(DEPDIR)/test_transaction_focus.Po \ - unit/$(DEPDIR)/test_transactor.Po \ - unit/$(DEPDIR)/test_type_name.Po unit/$(DEPDIR)/test_util.Po \ - unit/$(DEPDIR)/test_zview.Po + ./$(DEPDIR)/test_array.Po ./$(DEPDIR)/test_blob.Po \ + ./$(DEPDIR)/test_cancel_query.Po ./$(DEPDIR)/test_column.Po \ + ./$(DEPDIR)/test_composite.Po ./$(DEPDIR)/test_connection.Po \ + ./$(DEPDIR)/test_cursor.Po ./$(DEPDIR)/test_encodings.Po \ + ./$(DEPDIR)/test_error_verbosity.Po \ + ./$(DEPDIR)/test_errorhandler.Po ./$(DEPDIR)/test_escape.Po \ + ./$(DEPDIR)/test_exceptions.Po ./$(DEPDIR)/test_field.Po \ + ./$(DEPDIR)/test_float.Po ./$(DEPDIR)/test_largeobject.Po \ + ./$(DEPDIR)/test_nonblocking_connect.Po \ + ./$(DEPDIR)/test_notice_handler.Po \ + ./$(DEPDIR)/test_notification.Po ./$(DEPDIR)/test_pipeline.Po \ + ./$(DEPDIR)/test_prepared_statement.Po \ + ./$(DEPDIR)/test_range.Po ./$(DEPDIR)/test_read_transaction.Po \ + ./$(DEPDIR)/test_result_iteration.Po ./$(DEPDIR)/test_row.Po \ + ./$(DEPDIR)/test_separated_list.Po \ + ./$(DEPDIR)/test_simultaneous_transactions.Po \ + ./$(DEPDIR)/test_sql_cursor.Po \ + ./$(DEPDIR)/test_stateless_cursor.Po \ + ./$(DEPDIR)/test_strconv.Po ./$(DEPDIR)/test_stream_from.Po \ + ./$(DEPDIR)/test_stream_query.Po ./$(DEPDIR)/test_stream_to.Po \ + ./$(DEPDIR)/test_string_conversion.Po \ + ./$(DEPDIR)/test_subtransaction.Po \ + ./$(DEPDIR)/test_test_helpers.Po \ + ./$(DEPDIR)/test_thread_safety_model.Po \ + ./$(DEPDIR)/test_time.Po ./$(DEPDIR)/test_transaction.Po \ + ./$(DEPDIR)/test_transaction_base.Po \ + ./$(DEPDIR)/test_transaction_focus.Po \ + ./$(DEPDIR)/test_transactor.Po ./$(DEPDIR)/test_type_name.Po \ + ./$(DEPDIR)/test_util.Po ./$(DEPDIR)/test_zview.Po am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -501,50 +484,50 @@ runner_SOURCES = \ test88.cxx \ test89.cxx \ test90.cxx \ - unit/test_array.cxx \ - unit/test_blob.cxx \ - unit/test_cancel_query.cxx \ - unit/test_column.cxx \ - unit/test_composite.cxx \ - unit/test_connection.cxx \ - unit/test_cursor.cxx \ - unit/test_encodings.cxx \ - unit/test_error_verbosity.cxx \ - unit/test_errorhandler.cxx \ - unit/test_escape.cxx \ - unit/test_exceptions.cxx \ - unit/test_field.cxx \ - unit/test_float.cxx \ - unit/test_largeobject.cxx \ - unit/test_nonblocking_connect.cxx \ - unit/test_notice_handler.cxx \ - unit/test_notification.cxx \ - unit/test_pipeline.cxx \ - unit/test_prepared_statement.cxx \ - unit/test_range.cxx \ - unit/test_read_transaction.cxx \ - unit/test_result_iteration.cxx \ - unit/test_row.cxx \ - unit/test_separated_list.cxx \ - unit/test_simultaneous_transactions.cxx \ - unit/test_sql_cursor.cxx \ - unit/test_stateless_cursor.cxx \ - unit/test_strconv.cxx \ - unit/test_stream_from.cxx \ - unit/test_stream_query.cxx \ - unit/test_stream_to.cxx \ - unit/test_string_conversion.cxx \ - unit/test_subtransaction.cxx \ - unit/test_test_helpers.cxx \ - unit/test_thread_safety_model.cxx \ - unit/test_time.cxx \ - unit/test_transaction.cxx \ - unit/test_transaction_base.cxx \ - unit/test_transaction_focus.cxx \ - unit/test_transactor.cxx \ - unit/test_type_name.cxx \ - unit/test_util.cxx \ - unit/test_zview.cxx \ + test_array.cxx \ + test_blob.cxx \ + test_cancel_query.cxx \ + test_column.cxx \ + test_composite.cxx \ + test_connection.cxx \ + test_cursor.cxx \ + test_encodings.cxx \ + test_error_verbosity.cxx \ + test_errorhandler.cxx \ + test_escape.cxx \ + test_exceptions.cxx \ + test_field.cxx \ + test_float.cxx \ + test_largeobject.cxx \ + test_nonblocking_connect.cxx \ + test_notice_handler.cxx \ + test_notification.cxx \ + test_pipeline.cxx \ + test_prepared_statement.cxx \ + test_range.cxx \ + test_read_transaction.cxx \ + test_result_iteration.cxx \ + test_row.cxx \ + test_separated_list.cxx \ + test_simultaneous_transactions.cxx \ + test_sql_cursor.cxx \ + test_stateless_cursor.cxx \ + test_strconv.cxx \ + test_stream_from.cxx \ + test_stream_query.cxx \ + test_stream_to.cxx \ + test_string_conversion.cxx \ + test_subtransaction.cxx \ + test_test_helpers.cxx \ + test_thread_safety_model.cxx \ + test_time.cxx \ + test_transaction.cxx \ + test_transaction_base.cxx \ + test_transaction_focus.cxx \ + test_transactor.cxx \ + test_type_name.cxx \ + test_util.cxx \ + test_zview.cxx \ runner.cxx runner_LDADD = $(top_builddir)/src/libpqxx.la ${POSTGRES_LIB} @@ -590,100 +573,6 @@ clean-checkPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -unit/$(am__dirstamp): - @$(MKDIR_P) unit - @: > unit/$(am__dirstamp) -unit/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) unit/$(DEPDIR) - @: > unit/$(DEPDIR)/$(am__dirstamp) -unit/test_array.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_blob.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_cancel_query.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_column.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_composite.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_connection.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_cursor.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_encodings.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_error_verbosity.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_errorhandler.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_escape.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_exceptions.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_field.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_float.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_largeobject.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_nonblocking_connect.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_notice_handler.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_notification.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_pipeline.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_prepared_statement.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_range.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_read_transaction.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_result_iteration.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_row.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_separated_list.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_simultaneous_transactions.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_sql_cursor.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_stateless_cursor.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_strconv.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_stream_from.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_stream_query.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_stream_to.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_string_conversion.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_subtransaction.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_test_helpers.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_thread_safety_model.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_time.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_transaction.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_transaction_base.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_transaction_focus.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_transactor.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_type_name.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_util.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) -unit/test_zview.$(OBJEXT): unit/$(am__dirstamp) \ - unit/$(DEPDIR)/$(am__dirstamp) runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES) $(EXTRA_runner_DEPENDENCIES) @rm -f runner$(EXEEXT) @@ -691,7 +580,6 @@ runner$(EXEEXT): $(runner_OBJECTS) $(runner_DEPENDENCIES) $(EXTRA_runner_DEPENDE mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f unit/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -734,50 +622,50 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test88.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test89.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test90.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_array.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_blob.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_cancel_query.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_column.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_composite.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_connection.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_cursor.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_encodings.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_error_verbosity.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_errorhandler.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_escape.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_exceptions.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_field.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_float.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_largeobject.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_nonblocking_connect.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_notice_handler.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_notification.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_pipeline.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_prepared_statement.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_range.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_read_transaction.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_result_iteration.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_row.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_separated_list.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_simultaneous_transactions.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_sql_cursor.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_stateless_cursor.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_strconv.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_stream_from.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_stream_query.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_stream_to.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_string_conversion.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_subtransaction.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_test_helpers.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_thread_safety_model.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_time.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_transaction.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_transaction_base.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_transaction_focus.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_transactor.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_type_name.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_util.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test_zview.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_array.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_blob.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cancel_query.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_column.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_composite.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_connection.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cursor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_encodings.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_error_verbosity.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_errorhandler.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_escape.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_exceptions.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_field.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_float.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_largeobject.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_nonblocking_connect.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_notice_handler.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_notification.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pipeline.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_prepared_statement.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_range.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_read_transaction.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_result_iteration.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_row.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_separated_list.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_simultaneous_transactions.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sql_cursor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_stateless_cursor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strconv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_stream_from.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_stream_query.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_stream_to.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_string_conversion.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_subtransaction.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_test_helpers.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_thread_safety_model.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_time.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_transaction.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_transaction_base.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_transaction_focus.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_transactor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_type_name.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_util.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_zview.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -1025,8 +913,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f unit/$(DEPDIR)/$(am__dirstamp) - -rm -f unit/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1076,50 +962,50 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/test88.Po -rm -f ./$(DEPDIR)/test89.Po -rm -f ./$(DEPDIR)/test90.Po - -rm -f unit/$(DEPDIR)/test_array.Po - -rm -f unit/$(DEPDIR)/test_blob.Po - -rm -f unit/$(DEPDIR)/test_cancel_query.Po - -rm -f unit/$(DEPDIR)/test_column.Po - -rm -f unit/$(DEPDIR)/test_composite.Po - -rm -f unit/$(DEPDIR)/test_connection.Po - -rm -f unit/$(DEPDIR)/test_cursor.Po - -rm -f unit/$(DEPDIR)/test_encodings.Po - -rm -f unit/$(DEPDIR)/test_error_verbosity.Po - -rm -f unit/$(DEPDIR)/test_errorhandler.Po - -rm -f unit/$(DEPDIR)/test_escape.Po - -rm -f unit/$(DEPDIR)/test_exceptions.Po - -rm -f unit/$(DEPDIR)/test_field.Po - -rm -f unit/$(DEPDIR)/test_float.Po - -rm -f unit/$(DEPDIR)/test_largeobject.Po - -rm -f unit/$(DEPDIR)/test_nonblocking_connect.Po - -rm -f unit/$(DEPDIR)/test_notice_handler.Po - -rm -f unit/$(DEPDIR)/test_notification.Po - -rm -f unit/$(DEPDIR)/test_pipeline.Po - -rm -f unit/$(DEPDIR)/test_prepared_statement.Po - -rm -f unit/$(DEPDIR)/test_range.Po - -rm -f unit/$(DEPDIR)/test_read_transaction.Po - -rm -f unit/$(DEPDIR)/test_result_iteration.Po - -rm -f unit/$(DEPDIR)/test_row.Po - -rm -f unit/$(DEPDIR)/test_separated_list.Po - -rm -f unit/$(DEPDIR)/test_simultaneous_transactions.Po - -rm -f unit/$(DEPDIR)/test_sql_cursor.Po - -rm -f unit/$(DEPDIR)/test_stateless_cursor.Po - -rm -f unit/$(DEPDIR)/test_strconv.Po - -rm -f unit/$(DEPDIR)/test_stream_from.Po - -rm -f unit/$(DEPDIR)/test_stream_query.Po - -rm -f unit/$(DEPDIR)/test_stream_to.Po - -rm -f unit/$(DEPDIR)/test_string_conversion.Po - -rm -f unit/$(DEPDIR)/test_subtransaction.Po - -rm -f unit/$(DEPDIR)/test_test_helpers.Po - -rm -f unit/$(DEPDIR)/test_thread_safety_model.Po - -rm -f unit/$(DEPDIR)/test_time.Po - -rm -f unit/$(DEPDIR)/test_transaction.Po - -rm -f unit/$(DEPDIR)/test_transaction_base.Po - -rm -f unit/$(DEPDIR)/test_transaction_focus.Po - -rm -f unit/$(DEPDIR)/test_transactor.Po - -rm -f unit/$(DEPDIR)/test_type_name.Po - -rm -f unit/$(DEPDIR)/test_util.Po - -rm -f unit/$(DEPDIR)/test_zview.Po + -rm -f ./$(DEPDIR)/test_array.Po + -rm -f ./$(DEPDIR)/test_blob.Po + -rm -f ./$(DEPDIR)/test_cancel_query.Po + -rm -f ./$(DEPDIR)/test_column.Po + -rm -f ./$(DEPDIR)/test_composite.Po + -rm -f ./$(DEPDIR)/test_connection.Po + -rm -f ./$(DEPDIR)/test_cursor.Po + -rm -f ./$(DEPDIR)/test_encodings.Po + -rm -f ./$(DEPDIR)/test_error_verbosity.Po + -rm -f ./$(DEPDIR)/test_errorhandler.Po + -rm -f ./$(DEPDIR)/test_escape.Po + -rm -f ./$(DEPDIR)/test_exceptions.Po + -rm -f ./$(DEPDIR)/test_field.Po + -rm -f ./$(DEPDIR)/test_float.Po + -rm -f ./$(DEPDIR)/test_largeobject.Po + -rm -f ./$(DEPDIR)/test_nonblocking_connect.Po + -rm -f ./$(DEPDIR)/test_notice_handler.Po + -rm -f ./$(DEPDIR)/test_notification.Po + -rm -f ./$(DEPDIR)/test_pipeline.Po + -rm -f ./$(DEPDIR)/test_prepared_statement.Po + -rm -f ./$(DEPDIR)/test_range.Po + -rm -f ./$(DEPDIR)/test_read_transaction.Po + -rm -f ./$(DEPDIR)/test_result_iteration.Po + -rm -f ./$(DEPDIR)/test_row.Po + -rm -f ./$(DEPDIR)/test_separated_list.Po + -rm -f ./$(DEPDIR)/test_simultaneous_transactions.Po + -rm -f ./$(DEPDIR)/test_sql_cursor.Po + -rm -f ./$(DEPDIR)/test_stateless_cursor.Po + -rm -f ./$(DEPDIR)/test_strconv.Po + -rm -f ./$(DEPDIR)/test_stream_from.Po + -rm -f ./$(DEPDIR)/test_stream_query.Po + -rm -f ./$(DEPDIR)/test_stream_to.Po + -rm -f ./$(DEPDIR)/test_string_conversion.Po + -rm -f ./$(DEPDIR)/test_subtransaction.Po + -rm -f ./$(DEPDIR)/test_test_helpers.Po + -rm -f ./$(DEPDIR)/test_thread_safety_model.Po + -rm -f ./$(DEPDIR)/test_time.Po + -rm -f ./$(DEPDIR)/test_transaction.Po + -rm -f ./$(DEPDIR)/test_transaction_base.Po + -rm -f ./$(DEPDIR)/test_transaction_focus.Po + -rm -f ./$(DEPDIR)/test_transactor.Po + -rm -f ./$(DEPDIR)/test_type_name.Po + -rm -f ./$(DEPDIR)/test_util.Po + -rm -f ./$(DEPDIR)/test_zview.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1203,50 +1089,50 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/test88.Po -rm -f ./$(DEPDIR)/test89.Po -rm -f ./$(DEPDIR)/test90.Po - -rm -f unit/$(DEPDIR)/test_array.Po - -rm -f unit/$(DEPDIR)/test_blob.Po - -rm -f unit/$(DEPDIR)/test_cancel_query.Po - -rm -f unit/$(DEPDIR)/test_column.Po - -rm -f unit/$(DEPDIR)/test_composite.Po - -rm -f unit/$(DEPDIR)/test_connection.Po - -rm -f unit/$(DEPDIR)/test_cursor.Po - -rm -f unit/$(DEPDIR)/test_encodings.Po - -rm -f unit/$(DEPDIR)/test_error_verbosity.Po - -rm -f unit/$(DEPDIR)/test_errorhandler.Po - -rm -f unit/$(DEPDIR)/test_escape.Po - -rm -f unit/$(DEPDIR)/test_exceptions.Po - -rm -f unit/$(DEPDIR)/test_field.Po - -rm -f unit/$(DEPDIR)/test_float.Po - -rm -f unit/$(DEPDIR)/test_largeobject.Po - -rm -f unit/$(DEPDIR)/test_nonblocking_connect.Po - -rm -f unit/$(DEPDIR)/test_notice_handler.Po - -rm -f unit/$(DEPDIR)/test_notification.Po - -rm -f unit/$(DEPDIR)/test_pipeline.Po - -rm -f unit/$(DEPDIR)/test_prepared_statement.Po - -rm -f unit/$(DEPDIR)/test_range.Po - -rm -f unit/$(DEPDIR)/test_read_transaction.Po - -rm -f unit/$(DEPDIR)/test_result_iteration.Po - -rm -f unit/$(DEPDIR)/test_row.Po - -rm -f unit/$(DEPDIR)/test_separated_list.Po - -rm -f unit/$(DEPDIR)/test_simultaneous_transactions.Po - -rm -f unit/$(DEPDIR)/test_sql_cursor.Po - -rm -f unit/$(DEPDIR)/test_stateless_cursor.Po - -rm -f unit/$(DEPDIR)/test_strconv.Po - -rm -f unit/$(DEPDIR)/test_stream_from.Po - -rm -f unit/$(DEPDIR)/test_stream_query.Po - -rm -f unit/$(DEPDIR)/test_stream_to.Po - -rm -f unit/$(DEPDIR)/test_string_conversion.Po - -rm -f unit/$(DEPDIR)/test_subtransaction.Po - -rm -f unit/$(DEPDIR)/test_test_helpers.Po - -rm -f unit/$(DEPDIR)/test_thread_safety_model.Po - -rm -f unit/$(DEPDIR)/test_time.Po - -rm -f unit/$(DEPDIR)/test_transaction.Po - -rm -f unit/$(DEPDIR)/test_transaction_base.Po - -rm -f unit/$(DEPDIR)/test_transaction_focus.Po - -rm -f unit/$(DEPDIR)/test_transactor.Po - -rm -f unit/$(DEPDIR)/test_type_name.Po - -rm -f unit/$(DEPDIR)/test_util.Po - -rm -f unit/$(DEPDIR)/test_zview.Po + -rm -f ./$(DEPDIR)/test_array.Po + -rm -f ./$(DEPDIR)/test_blob.Po + -rm -f ./$(DEPDIR)/test_cancel_query.Po + -rm -f ./$(DEPDIR)/test_column.Po + -rm -f ./$(DEPDIR)/test_composite.Po + -rm -f ./$(DEPDIR)/test_connection.Po + -rm -f ./$(DEPDIR)/test_cursor.Po + -rm -f ./$(DEPDIR)/test_encodings.Po + -rm -f ./$(DEPDIR)/test_error_verbosity.Po + -rm -f ./$(DEPDIR)/test_errorhandler.Po + -rm -f ./$(DEPDIR)/test_escape.Po + -rm -f ./$(DEPDIR)/test_exceptions.Po + -rm -f ./$(DEPDIR)/test_field.Po + -rm -f ./$(DEPDIR)/test_float.Po + -rm -f ./$(DEPDIR)/test_largeobject.Po + -rm -f ./$(DEPDIR)/test_nonblocking_connect.Po + -rm -f ./$(DEPDIR)/test_notice_handler.Po + -rm -f ./$(DEPDIR)/test_notification.Po + -rm -f ./$(DEPDIR)/test_pipeline.Po + -rm -f ./$(DEPDIR)/test_prepared_statement.Po + -rm -f ./$(DEPDIR)/test_range.Po + -rm -f ./$(DEPDIR)/test_read_transaction.Po + -rm -f ./$(DEPDIR)/test_result_iteration.Po + -rm -f ./$(DEPDIR)/test_row.Po + -rm -f ./$(DEPDIR)/test_separated_list.Po + -rm -f ./$(DEPDIR)/test_simultaneous_transactions.Po + -rm -f ./$(DEPDIR)/test_sql_cursor.Po + -rm -f ./$(DEPDIR)/test_stateless_cursor.Po + -rm -f ./$(DEPDIR)/test_strconv.Po + -rm -f ./$(DEPDIR)/test_stream_from.Po + -rm -f ./$(DEPDIR)/test_stream_query.Po + -rm -f ./$(DEPDIR)/test_stream_to.Po + -rm -f ./$(DEPDIR)/test_string_conversion.Po + -rm -f ./$(DEPDIR)/test_subtransaction.Po + -rm -f ./$(DEPDIR)/test_test_helpers.Po + -rm -f ./$(DEPDIR)/test_thread_safety_model.Po + -rm -f ./$(DEPDIR)/test_time.Po + -rm -f ./$(DEPDIR)/test_transaction.Po + -rm -f ./$(DEPDIR)/test_transaction_base.Po + -rm -f ./$(DEPDIR)/test_transaction_focus.Po + -rm -f ./$(DEPDIR)/test_transactor.Po + -rm -f ./$(DEPDIR)/test_type_name.Po + -rm -f ./$(DEPDIR)/test_util.Po + -rm -f ./$(DEPDIR)/test_zview.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/test/unit/test_array.cxx b/test/test_array.cxx similarity index 99% rename from test/unit/test_array.cxx rename to test/test_array.cxx index c8861f2ac..e7da2ef6c 100644 --- a/test/unit/test_array.cxx +++ b/test/test_array.cxx @@ -1,6 +1,6 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" // Test program for libpqxx array parsing. diff --git a/test/unit/test_blob.cxx b/test/test_blob.cxx similarity index 99% rename from test/unit/test_blob.cxx rename to test/test_blob.cxx index b7c540be1..eb603170b 100644 --- a/test/unit/test_blob.cxx +++ b/test/test_blob.cxx @@ -4,8 +4,8 @@ #include #include -#include "../test_helpers.hxx" -#include "../test_types.hxx" +#include "test_helpers.hxx" +#include "test_types.hxx" namespace diff --git a/test/unit/test_cancel_query.cxx b/test/test_cancel_query.cxx similarity index 94% rename from test/unit/test_cancel_query.cxx rename to test/test_cancel_query.cxx index b38f0206a..c9b1344f5 100644 --- a/test/unit/test_cancel_query.cxx +++ b/test/test_cancel_query.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_column.cxx b/test/test_column.cxx similarity index 98% rename from test/unit/test_column.cxx rename to test/test_column.cxx index eb84acd63..69a318bd1 100644 --- a/test/unit/test_column.cxx +++ b/test/test_column.cxx @@ -1,6 +1,6 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_composite.cxx b/test/test_composite.cxx similarity index 98% rename from test/unit/test_composite.cxx rename to test/test_composite.cxx index 9e5745070..ba3d73982 100644 --- a/test/unit/test_composite.cxx +++ b/test/test_composite.cxx @@ -1,4 +1,4 @@ -#include "../test_helpers.hxx" +#include "test_helpers.hxx" #include "pqxx/composite" #include "pqxx/transaction" diff --git a/test/unit/test_connection.cxx b/test/test_connection.cxx similarity index 99% rename from test/unit/test_connection.cxx rename to test/test_connection.cxx index e9a52809d..38d7cd7a3 100644 --- a/test/unit/test_connection.cxx +++ b/test/test_connection.cxx @@ -3,7 +3,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_cursor.cxx b/test/test_cursor.cxx similarity index 97% rename from test/unit/test_cursor.cxx rename to test/test_cursor.cxx index 2a2b2b243..b5676cdef 100644 --- a/test/unit/test_cursor.cxx +++ b/test/test_cursor.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_encodings.cxx b/test/test_encodings.cxx similarity index 99% rename from test/unit/test_encodings.cxx rename to test/test_encodings.cxx index 4374671c6..7965357a5 100644 --- a/test/unit/test_encodings.cxx +++ b/test/test_encodings.cxx @@ -1,4 +1,4 @@ -#include "../test_helpers.hxx" +#include "test_helpers.hxx" #include "pqxx/internal/encodings.hxx" diff --git a/test/unit/test_error_verbosity.cxx b/test/test_error_verbosity.cxx similarity index 96% rename from test/unit/test_error_verbosity.cxx rename to test/test_error_verbosity.cxx index c77df17c7..c47782c05 100644 --- a/test/unit/test_error_verbosity.cxx +++ b/test/test_error_verbosity.cxx @@ -1,6 +1,6 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" extern "C" { diff --git a/test/unit/test_errorhandler.cxx b/test/test_errorhandler.cxx similarity index 99% rename from test/unit/test_errorhandler.cxx rename to test/test_errorhandler.cxx index edfa4f19f..b40275694 100644 --- a/test/unit/test_errorhandler.cxx +++ b/test/test_errorhandler.cxx @@ -3,7 +3,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_escape.cxx b/test/test_escape.cxx similarity index 99% rename from test/unit/test_escape.cxx rename to test/test_escape.cxx index 51546eb5f..408e6fe88 100644 --- a/test/unit/test_escape.cxx +++ b/test/test_escape.cxx @@ -2,7 +2,7 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_exceptions.cxx b/test/test_exceptions.cxx similarity index 96% rename from test/unit/test_exceptions.cxx rename to test/test_exceptions.cxx index 1fee49c84..831c7c5ac 100644 --- a/test/unit/test_exceptions.cxx +++ b/test/test_exceptions.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace diff --git a/test/unit/test_field.cxx b/test/test_field.cxx similarity index 98% rename from test/unit/test_field.cxx rename to test/test_field.cxx index 86a156568..1995d85a4 100644 --- a/test/unit/test_field.cxx +++ b/test/test_field.cxx @@ -1,6 +1,6 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_float.cxx b/test/test_float.cxx similarity index 99% rename from test/unit/test_float.cxx rename to test/test_float.cxx index 312409a3d..308bd7bbc 100644 --- a/test/unit/test_float.cxx +++ b/test/test_float.cxx @@ -2,7 +2,7 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_largeobject.cxx b/test/test_largeobject.cxx similarity index 98% rename from test/unit/test_largeobject.cxx rename to test/test_largeobject.cxx index 4fa1c10b2..e6113ae77 100644 --- a/test/unit/test_largeobject.cxx +++ b/test/test_largeobject.cxx @@ -4,7 +4,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_nonblocking_connect.cxx b/test/test_nonblocking_connect.cxx similarity index 94% rename from test/unit/test_nonblocking_connect.cxx rename to test/test_nonblocking_connect.cxx index 1b24b814c..eb690f022 100644 --- a/test/unit/test_nonblocking_connect.cxx +++ b/test/test_nonblocking_connect.cxx @@ -2,7 +2,7 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace diff --git a/test/unit/test_notice_handler.cxx b/test/test_notice_handler.cxx similarity index 99% rename from test/unit/test_notice_handler.cxx rename to test/test_notice_handler.cxx index 45b7957b9..2ab060504 100644 --- a/test/unit/test_notice_handler.cxx +++ b/test/test_notice_handler.cxx @@ -1,6 +1,6 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_notification.cxx b/test/test_notification.cxx similarity index 99% rename from test/unit/test_notification.cxx rename to test/test_notification.cxx index 2c38fbb88..1864585c2 100644 --- a/test/unit/test_notification.cxx +++ b/test/test_notification.cxx @@ -10,7 +10,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_pipeline.cxx b/test/test_pipeline.cxx similarity index 98% rename from test/unit/test_pipeline.cxx rename to test/test_pipeline.cxx index 8011c57ee..ff78ba3d2 100644 --- a/test/unit/test_pipeline.cxx +++ b/test/test_pipeline.cxx @@ -3,7 +3,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_prepared_statement.cxx b/test/test_prepared_statement.cxx similarity index 99% rename from test/unit/test_prepared_statement.cxx rename to test/test_prepared_statement.cxx index 54596a54a..bf26d6cce 100644 --- a/test/unit/test_prepared_statement.cxx +++ b/test/test_prepared_statement.cxx @@ -5,7 +5,7 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" // Test program for libpqxx. Define and use prepared statements. diff --git a/test/unit/test_range.cxx b/test/test_range.cxx similarity index 99% rename from test/unit/test_range.cxx rename to test/test_range.cxx index 0272a889b..52ff98399 100644 --- a/test/unit/test_range.cxx +++ b/test/test_range.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace diff --git a/test/unit/test_read_transaction.cxx b/test/test_read_transaction.cxx similarity index 93% rename from test/unit/test_read_transaction.cxx rename to test/test_read_transaction.cxx index 28c3a2041..9723b7e8a 100644 --- a/test/unit/test_read_transaction.cxx +++ b/test/test_read_transaction.cxx @@ -1,6 +1,6 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_result_iteration.cxx b/test/test_result_iteration.cxx similarity index 99% rename from test/unit/test_result_iteration.cxx rename to test/test_result_iteration.cxx index ff444e28b..aee58994a 100644 --- a/test/unit/test_result_iteration.cxx +++ b/test/test_result_iteration.cxx @@ -3,7 +3,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_row.cxx b/test/test_row.cxx similarity index 99% rename from test/unit/test_row.cxx rename to test/test_row.cxx index 7beaa5f03..ed49abc9b 100644 --- a/test/unit/test_row.cxx +++ b/test/test_row.cxx @@ -2,7 +2,7 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_separated_list.cxx b/test/test_separated_list.cxx similarity index 96% rename from test/unit/test_separated_list.cxx rename to test/test_separated_list.cxx index 748379b47..310cdd2c1 100644 --- a/test/unit/test_separated_list.cxx +++ b/test/test_separated_list.cxx @@ -1,6 +1,6 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" // Test program for separated_list. diff --git a/test/unit/test_simultaneous_transactions.cxx b/test/test_simultaneous_transactions.cxx similarity index 92% rename from test/unit/test_simultaneous_transactions.cxx rename to test/test_simultaneous_transactions.cxx index 1c536a95e..180fa6206 100644 --- a/test/unit/test_simultaneous_transactions.cxx +++ b/test/test_simultaneous_transactions.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_sql_cursor.cxx b/test/test_sql_cursor.cxx similarity index 99% rename from test/unit/test_sql_cursor.cxx rename to test/test_sql_cursor.cxx index 2be893fb9..bc37b4030 100644 --- a/test/unit/test_sql_cursor.cxx +++ b/test/test_sql_cursor.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_stateless_cursor.cxx b/test/test_stateless_cursor.cxx similarity index 99% rename from test/unit/test_stateless_cursor.cxx rename to test/test_stateless_cursor.cxx index 1ee538440..39f0b4b57 100644 --- a/test/unit/test_stateless_cursor.cxx +++ b/test/test_stateless_cursor.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_strconv.cxx b/test/test_strconv.cxx similarity index 99% rename from test/unit/test_strconv.cxx rename to test/test_strconv.cxx index be6ce0ee7..baaf26c72 100644 --- a/test/unit/test_strconv.cxx +++ b/test/test_strconv.cxx @@ -3,7 +3,7 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_stream_from.cxx b/test/test_stream_from.cxx similarity index 99% rename from test/unit/test_stream_from.cxx rename to test/test_stream_from.cxx index 03606d918..534c20137 100644 --- a/test/unit/test_stream_from.cxx +++ b/test/test_stream_from.cxx @@ -1,8 +1,8 @@ #include #include -#include "../test_helpers.hxx" -#include "../test_types.hxx" +#include "test_helpers.hxx" +#include "test_types.hxx" #include #include diff --git a/test/unit/test_stream_query.cxx b/test/test_stream_query.cxx similarity index 99% rename from test/unit/test_stream_query.cxx rename to test/test_stream_query.cxx index a89bea43d..2f12e0179 100644 --- a/test/unit/test_stream_query.cxx +++ b/test/test_stream_query.cxx @@ -1,7 +1,7 @@ #include -#include "../test_helpers.hxx" -#include "../test_types.hxx" +#include "test_helpers.hxx" +#include "test_types.hxx" #include #include diff --git a/test/unit/test_stream_to.cxx b/test/test_stream_to.cxx similarity index 99% rename from test/unit/test_stream_to.cxx rename to test/test_stream_to.cxx index 20efef55f..634179039 100644 --- a/test/unit/test_stream_to.cxx +++ b/test/test_stream_to.cxx @@ -4,8 +4,8 @@ #include #include -#include "../test_helpers.hxx" -#include "../test_types.hxx" +#include "test_helpers.hxx" +#include "test_types.hxx" namespace { diff --git a/test/unit/test_string_conversion.cxx b/test/test_string_conversion.cxx similarity index 99% rename from test/unit/test_string_conversion.cxx rename to test/test_string_conversion.cxx index 44e4761c8..dbbdd6e63 100644 --- a/test/unit/test_string_conversion.cxx +++ b/test/test_string_conversion.cxx @@ -4,7 +4,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" using namespace std::literals; diff --git a/test/unit/test_subtransaction.cxx b/test/test_subtransaction.cxx similarity index 98% rename from test/unit/test_subtransaction.cxx rename to test/test_subtransaction.cxx index 941fc5519..7c17b8cad 100644 --- a/test/unit/test_subtransaction.cxx +++ b/test/test_subtransaction.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_test_helpers.cxx b/test/test_test_helpers.cxx similarity index 99% rename from test/unit/test_test_helpers.cxx rename to test/test_test_helpers.cxx index f6ccf94b7..cc84b536a 100644 --- a/test/unit/test_test_helpers.cxx +++ b/test/test_test_helpers.cxx @@ -1,4 +1,4 @@ -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_thread_safety_model.cxx b/test/test_thread_safety_model.cxx similarity index 93% rename from test/unit/test_thread_safety_model.cxx rename to test/test_thread_safety_model.cxx index cf7627cb3..97b99869f 100644 --- a/test/unit/test_thread_safety_model.cxx +++ b/test/test_thread_safety_model.cxx @@ -1,4 +1,4 @@ -#include "../test_helpers.hxx" +#include "test_helpers.hxx" #include diff --git a/test/unit/test_time.cxx b/test/test_time.cxx similarity index 98% rename from test/unit/test_time.cxx rename to test/test_time.cxx index 115af2d9c..621d5f5b5 100644 --- a/test/unit/test_time.cxx +++ b/test/test_time.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_transaction.cxx b/test/test_transaction.cxx similarity index 98% rename from test/unit/test_transaction.cxx rename to test/test_transaction.cxx index 0195d196a..cd7762a68 100644 --- a/test/unit/test_transaction.cxx +++ b/test/test_transaction.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace diff --git a/test/unit/test_transaction_base.cxx b/test/test_transaction_base.cxx similarity index 99% rename from test/unit/test_transaction_base.cxx rename to test/test_transaction_base.cxx index 4f3b26980..bed2d0192 100644 --- a/test/unit/test_transaction_base.cxx +++ b/test/test_transaction_base.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_transaction_focus.cxx b/test/test_transaction_focus.cxx similarity index 97% rename from test/unit/test_transaction_focus.cxx rename to test/test_transaction_focus.cxx index 31b4a6f4c..e056c0be2 100644 --- a/test/unit/test_transaction_focus.cxx +++ b/test/test_transaction_focus.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_transactor.cxx b/test/test_transactor.cxx similarity index 99% rename from test/unit/test_transactor.cxx rename to test/test_transactor.cxx index f278e0e93..6fa12c520 100644 --- a/test/unit/test_transactor.cxx +++ b/test/test_transactor.cxx @@ -1,7 +1,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_type_name.cxx b/test/test_type_name.cxx similarity index 94% rename from test/unit/test_type_name.cxx rename to test/test_type_name.cxx index af1c93eb5..5cdc12fe6 100644 --- a/test/unit/test_type_name.cxx +++ b/test/test_type_name.cxx @@ -1,4 +1,4 @@ -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_util.cxx b/test/test_util.cxx similarity index 96% rename from test/unit/test_util.cxx rename to test/test_util.cxx index 01c447635..293a937e6 100644 --- a/test/unit/test_util.cxx +++ b/test/test_util.cxx @@ -3,7 +3,7 @@ #include #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace { diff --git a/test/unit/test_zview.cxx b/test/test_zview.cxx similarity index 97% rename from test/unit/test_zview.cxx rename to test/test_zview.cxx index a853da6aa..d7920a7bc 100644 --- a/test/unit/test_zview.cxx +++ b/test/test_zview.cxx @@ -2,7 +2,7 @@ #include -#include "../test_helpers.hxx" +#include "test_helpers.hxx" namespace diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt deleted file mode 100644 index 34be39dab..000000000 --- a/test/unit/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -if(NOT PostgreSQL_FOUND) - find_package(PostgreSQL REQUIRED) -endif() - -file(GLOB UNIT_TEST_SOURCES *.cxx) - -add_executable(unit_runner ${UNIT_TEST_SOURCES}) -target_link_libraries(unit_runner PUBLIC pqxx) -target_include_directories(unit_runner PRIVATE ${PostgreSQL_INCLUDE_DIRS}) -add_test( - NAME unit_runner - WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - COMMAND unit_runner -)