Trims the autotools build script.

git-svn-id: http://googletest.googlecode.com/svn/trunk@352 861a406c-534a-0410-8894-cb66d6ee9925

1 files changed, 102 insertions, 304 deletions

diff --git a/Makefile.am b/Makefile.am
index 14880b8..d147d13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,97 @@ EXTRA_DIST = \
   scons/SConstruct.common \
   scripts/fuse_gtest_files.py \
   scripts/gen_gtest_pred_impl.py \
-  scripts/test/Makefile \
-  test/gtest_all_test.cc
+  scripts/test/Makefile
+
+# gtest source files that we don't compile directly.
+EXTRA_DIST += \
+  src/gtest.cc \
+  src/gtest-death-test.cc \
+  src/gtest-filepath.cc \
+  src/gtest-internal-inl.h \
+  src/gtest-port.cc \
+  src/gtest-test-part.cc \
+  src/gtest-typed-test.cc
+
+# Sample files that we don't compile.
+EXTRA_DIST += \
+  samples/prime_tables.h \
+  samples/sample2_unittest.cc \
+  samples/sample3_unittest.cc \
+  samples/sample4_unittest.cc \
+  samples/sample5_unittest.cc \
+  samples/sample6_unittest.cc \
+  samples/sample7_unittest.cc \
+  samples/sample8_unittest.cc \
+  samples/sample9_unittest.cc
+
+# C++ test files that we don't compile directly.
+EXTRA_DIST += \
+  test/gtest-death-test_test.cc \
+  test/gtest_environment_test.cc \
+  test/gtest-filepath_test.cc \
+  test/gtest-linked_ptr_test.cc \
+  test/gtest-message_test.cc \
+  test/gtest_no_test_unittest.cc \
+  test/gtest-options_test.cc \
+  test/gtest-param-test_test.cc \
+  test/gtest-param-test2_test.cc \
+  test/gtest-param-test_test.h \
+  test/gtest-port_test.cc \
+  test/gtest_pred_impl_unittest.cc \
+  test/gtest_prod_test.cc \
+  test/production.cc \
+  test/production.h \
+  test/gtest_repeat_test.cc \
+  test/gtest_sole_header_test.cc \
+  test/gtest_stress_test.cc \
+  test/gtest-test-part_test.cc \
+  test/gtest_throw_on_failure_ex_test.cc \
+  test/gtest-typed-test_test.cc \
+  test/gtest-typed-test2_test.cc \
+  test/gtest-typed-test_test.h \
+  test/gtest_unittest.cc \
+  test/gtest-unittest-api_test.cc \
+  test/gtest-listener_test.cc \
+  test/gtest_main_unittest.cc \
+  test/gtest_unittest.cc \
+  test/gtest-tuple_test.cc \
+  test/gtest-param-test_test.cc \
+  test/gtest-param-test2_test.cc \
+  test/gtest_break_on_failure_unittest_.cc \
+  test/gtest_color_test_.cc \
+  test/gtest_env_var_test_.cc \
+  test/gtest_filter_unittest_.cc \
+  test/gtest_help_test_.cc \
+  test/gtest_list_tests_unittest_.cc \
+  test/gtest_output_test_.cc \
+  test/gtest_shuffle_test_.cc \
+  test/gtest_throw_on_failure_test_.cc \
+  test/gtest_uninitialized_test_.cc \
+  test/gtest_xml_outfile1_test_.cc \
+  test/gtest_xml_outfile2_test_.cc \
+  test/gtest_xml_output_unittest_.cc
+
+# Python tests that we don't run.
+EXTRA_DIST += \
+  test/gtest_test_utils.py \
+  test/gtest_xml_test_utils.py \
+  test/gtest_break_on_failure_unittest.py \
+  test/gtest_color_test.py \
+  test/gtest_env_var_test.py \
+  test/gtest_filter_unittest.py \
+  test/gtest_help_test.py \
+  test/gtest_list_tests_unittest.py \
+  test/gtest_output_test.py \
+  test/gtest_output_test_golden_lin.txt \
+  test/gtest_output_test_golden_win.txt \
+  test/gtest_shuffle_test.py \
+  test/gtest_throw_on_failure_test.py \
+  test/gtest_uninitialized_test.py \
+  test/gtest_xml_outfiles_test.py \
+  test/gtest_xml_output_unittest.py \
+  test/run_tests_util.py \
+  test/run_tests_util_test.py
 
 # MSVC project files
 EXTRA_DIST += \
@@ -84,13 +173,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
 # Build rules for libraries.
 lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
 
-lib_libgtest_la_SOURCES = src/gtest.cc \
-                          src/gtest-death-test.cc \
-                          src/gtest-filepath.cc \
-                          src/gtest-internal-inl.h \
-                          src/gtest-port.cc \
-                          src/gtest-test-part.cc \
-                          src/gtest-typed-test.cc
+lib_libgtest_la_SOURCES = src/gtest-all.cc
 
 pkginclude_HEADERS = include/gtest/gtest.h \
                      include/gtest/gtest-death-test.h \
@@ -140,309 +223,24 @@ TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
                     GTEST_BUILD_DIR="$(top_builddir)/test"
 check_PROGRAMS=
 
+# A simple sample on using gtest.
 TESTS += samples/sample1_unittest
 check_PROGRAMS += samples/sample1_unittest
 samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
 samples_sample1_unittest_LDADD = lib/libgtest_main.la \
                                  samples/libsamples.la
 
-TESTS += samples/sample2_unittest
-check_PROGRAMS += samples/sample2_unittest
-samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc
-samples_sample2_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample3_unittest
-check_PROGRAMS += samples/sample3_unittest
-samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc
-samples_sample3_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample4_unittest
-check_PROGRAMS += samples/sample4_unittest
-samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc
-samples_sample4_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample5_unittest
-check_PROGRAMS += samples/sample5_unittest
-samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc
-samples_sample5_unittest_LDADD = lib/libgtest_main.la \
-                                 samples/libsamples.la
-
-TESTS += samples/sample6_unittest
-check_PROGRAMS += samples/sample6_unittest
-samples_sample6_unittest_SOURCES = samples/prime_tables.h \
-                                   samples/sample6_unittest.cc
-samples_sample6_unittest_LDADD = lib/libgtest_main.la
-
-TESTS += samples/sample7_unittest
-check_PROGRAMS += samples/sample7_unittest
-samples_sample7_unittest_SOURCES = samples/prime_tables.h \
-                                   samples/sample7_unittest.cc
-samples_sample7_unittest_LDADD = lib/libgtest_main.la
-
-TESTS += samples/sample8_unittest
-check_PROGRAMS += samples/sample8_unittest
-samples_sample8_unittest_SOURCES = samples/prime_tables.h \
-                                   samples/sample8_unittest.cc
-samples_sample8_unittest_LDADD = lib/libgtest_main.la
-
-TESTS += samples/sample9_unittest
-check_PROGRAMS += samples/sample9_unittest
-samples_sample9_unittest_SOURCES = samples/sample9_unittest.cc
-samples_sample9_unittest_LDADD = lib/libgtest.la
-
+# Another sample.  It also verifies that libgtest works.
 TESTS += samples/sample10_unittest
 check_PROGRAMS += samples/sample10_unittest
 samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc
 samples_sample10_unittest_LDADD = lib/libgtest.la
 
-TESTS += test/gtest-death-test_test
-check_PROGRAMS += test/gtest-death-test_test
-test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc
-test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
-test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
-                                   lib/libgtest_main.la
-
-TESTS += test/gtest_environment_test
-check_PROGRAMS += test/gtest_environment_test
-test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc
-test_gtest_environment_test_LDADD = lib/libgtest.la
-
-TESTS += test/gtest-filepath_test
-check_PROGRAMS += test/gtest-filepath_test
-test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc
-test_gtest_filepath_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest-linked_ptr_test
-check_PROGRAMS += test/gtest-linked_ptr_test
-test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc
-test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_main_unittest
-check_PROGRAMS += test/gtest_main_unittest
-test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc
-test_gtest_main_unittest_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest-message_test
-check_PROGRAMS += test/gtest-message_test
-test_gtest_message_test_SOURCES = test/gtest-message_test.cc
-test_gtest_message_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_no_test_unittest
-check_PROGRAMS += test/gtest_no_test_unittest
-test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc
-test_gtest_no_test_unittest_LDADD = lib/libgtest.la
-
-TESTS += test/gtest-options_test
-check_PROGRAMS += test/gtest-options_test
-test_gtest_options_test_SOURCES = test/gtest-options_test.cc
-test_gtest_options_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest-param-test_test
-check_PROGRAMS += test/gtest-param-test_test
-test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \
-                                     test/gtest-param-test2_test.cc \
-                                     test/gtest-param-test_test.h
-test_gtest_param_test_test_LDADD = lib/libgtest.la
-
-TESTS += test/gtest-port_test
-check_PROGRAMS += test/gtest-port_test
-test_gtest_port_test_SOURCES = test/gtest-port_test.cc
-test_gtest_port_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_pred_impl_unittest
-check_PROGRAMS += test/gtest_pred_impl_unittest
-test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc
-test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_prod_test
-check_PROGRAMS += test/gtest_prod_test
-test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \
-                               test/production.cc \
-                               test/production.h
-test_gtest_prod_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_repeat_test
-check_PROGRAMS += test/gtest_repeat_test
-test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc
-test_gtest_repeat_test_LDADD = lib/libgtest.la
-
-TESTS += test/gtest_sole_header_test
-check_PROGRAMS += test/gtest_sole_header_test
-test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc
-test_gtest_sole_header_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_stress_test
-check_PROGRAMS += test/gtest_stress_test
-test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc
-test_gtest_stress_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
-test_gtest_stress_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
-                               lib/libgtest.la
-
-TESTS += test/gtest-test-part_test
-check_PROGRAMS += test/gtest-test-part_test
-test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc
-test_gtest_test_part_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_throw_on_failure_ex_test
-check_PROGRAMS += test/gtest_throw_on_failure_ex_test
-test_gtest_throw_on_failure_ex_test_SOURCES = \
-    test/gtest_throw_on_failure_ex_test.cc \
-    src/gtest-all.cc
-test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions
-
-TESTS += test/gtest-typed-test_test
-check_PROGRAMS += test/gtest-typed-test_test
-test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \
-                                     test/gtest-typed-test2_test.cc \
-                                     test/gtest-typed-test_test.h
-test_gtest_typed_test_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest_unittest
-check_PROGRAMS += test/gtest_unittest
-test_gtest_unittest_SOURCES = test/gtest_unittest.cc
-test_gtest_unittest_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest-unittest-api_test
-check_PROGRAMS += test/gtest-unittest-api_test
-test_gtest_unittest_api_test_SOURCES = test/gtest-unittest-api_test.cc
-test_gtest_unittest_api_test_LDADD = lib/libgtest_main.la
-
-TESTS += test/gtest-listener_test
-check_PROGRAMS += test/gtest-listener_test
-test_gtest_listener_test_SOURCES = test/gtest-listener_test.cc
-test_gtest_listener_test_LDADD = lib/libgtest_main.la
-
-# Verifies that Google Test works when RTTI is disabled.
-TESTS += test/gtest_no_rtti_test
-check_PROGRAMS += test/gtest_no_rtti_test
-test_gtest_no_rtti_test_SOURCES = test/gtest_unittest.cc \
-                                  src/gtest-all.cc \
-                                  src/gtest_main.cc
-test_gtest_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0
-
-# Verifies that Google Test's own TR1 tuple implementation works.
-TESTS += test/gtest-tuple_test
-check_PROGRAMS += test/gtest-tuple_test
-test_gtest_tuple_test_SOURCES = test/gtest-tuple_test.cc \
-                                src/gtest-all.cc \
-                                src/gtest_main.cc
-test_gtest_tuple_test_CXXFLAGS = $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
-
-# Verifies that Google Test's features that use its own TR1 tuple work.
-TESTS += test/gtest_use_own_tuple_test
-check_PROGRAMS += test/gtest_use_own_tuple_test
-test_gtest_use_own_tuple_test_SOURCES = test/gtest-param-test_test.cc \
-                                        test/gtest-param-test2_test.cc \
-                                        src/gtest-all.cc
-test_gtest_use_own_tuple_test_CXXFLAGS = \
-    $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
-
-# The following tests depend on the presence of a Python installation and are
-# keyed off of it. TODO(chandlerc@google.com): While we currently only attempt
-# to build and execute these tests if Autoconf has found Python v2.4 on the
-# system, we don't use the PYTHON variable it specified as the valid
-# interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and
-# thus we cannot distinguish between C++ unit tests and Python unit tests.
-if HAVE_PYTHON
-check_SCRIPTS =
-
-# These two Python modules are used by multiple Python tests below.
-check_SCRIPTS += test/gtest_test_utils.py \
-                 test/gtest_xml_test_utils.py
-
-check_PROGRAMS += test/gtest_break_on_failure_unittest_
-test_gtest_break_on_failure_unittest__SOURCES = \
-  test/gtest_break_on_failure_unittest_.cc
-test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_break_on_failure_unittest.py
-TESTS += test/gtest_break_on_failure_unittest.py
-
-check_PROGRAMS += test/gtest_color_test_
-test_gtest_color_test__SOURCES = test/gtest_color_test_.cc
-test_gtest_color_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_color_test.py
-TESTS += test/gtest_color_test.py
-
-check_PROGRAMS += test/gtest_env_var_test_
-test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc
-test_gtest_env_var_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_env_var_test.py
-TESTS += test/gtest_env_var_test.py
-
-check_PROGRAMS += test/gtest_filter_unittest_
-test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc
-test_gtest_filter_unittest__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_filter_unittest.py
-TESTS += test/gtest_filter_unittest.py
-
-check_PROGRAMS += test/gtest_help_test_
-test_gtest_help_test__SOURCES = test/gtest_help_test_.cc
-test_gtest_help_test__LDADD = lib/libgtest_main.la
-check_SCRIPTS += test/gtest_help_test.py
-TESTS += test/gtest_help_test.py
-
-check_PROGRAMS += test/gtest_list_tests_unittest_
-test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc
-test_gtest_list_tests_unittest__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_list_tests_unittest.py
-TESTS += test/gtest_list_tests_unittest.py
-
-check_PROGRAMS += test/gtest_output_test_
-test_gtest_output_test__SOURCES = test/gtest_output_test_.cc
-test_gtest_output_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_output_test.py
-EXTRA_DIST += test/gtest_output_test_golden_lin.txt \
-              test/gtest_output_test_golden_win.txt
-TESTS += test/gtest_output_test.py
-
-check_PROGRAMS += test/gtest_shuffle_test_
-test_gtest_shuffle_test__SOURCES = test/gtest_shuffle_test_.cc
-test_gtest_shuffle_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_shuffle_test.py
-TESTS += test/gtest_shuffle_test.py
-
-check_PROGRAMS += test/gtest_throw_on_failure_test_
-test_gtest_throw_on_failure_test__SOURCES = \
-  test/gtest_throw_on_failure_test_.cc \
-  src/gtest-all.cc
-test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions
-check_SCRIPTS += test/gtest_throw_on_failure_test.py
-TESTS += test/gtest_throw_on_failure_test.py
-
-check_PROGRAMS += test/gtest_uninitialized_test_
-test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc
-test_gtest_uninitialized_test__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_uninitialized_test.py
-TESTS += test/gtest_uninitialized_test.py
-
-check_PROGRAMS += test/gtest_xml_outfile1_test_
-test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc
-test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la
-check_PROGRAMS += test/gtest_xml_outfile2_test_
-test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc
-test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la
-check_SCRIPTS += test/gtest_xml_outfiles_test.py
-TESTS += test/gtest_xml_outfiles_test.py
-
-check_PROGRAMS += test/gtest_xml_output_unittest_
-test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc
-test_gtest_xml_output_unittest__LDADD = lib/libgtest.la
-check_SCRIPTS += test/gtest_xml_output_unittest.py
-TESTS += test/gtest_xml_output_unittest.py
-
-check_SCRIPTS += test/run_tests_util.py \
-                 test/run_tests_util_test.py
-TESTS += test/run_tests_util_test.py
-
-# TODO(wan@google.com): make the build script compile and run the
-#   negative-compilation tests.  (The test/gtest_nc* files are unfinished
-#   implementation of tests for verifying that certain kinds of misuse
-#   of Google Test don't compile.)
-EXTRA_DIST += $(check_SCRIPTS) \
-              test/gtest_nc.cc \
-              test/gtest_nc_test.py
-
-endif
+# This tests most constructs of gtest and verifies that libgtest_main
+# works.
+TESTS += test/gtest_all_test
+check_PROGRAMS += test/gtest_all_test
+test_gtest_all_test_SOURCES = test/gtest_all_test.cc
+test_gtest_all_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
+test_gtest_all_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
+                            lib/libgtest_main.la