Adds new test files to the distro, and sorts the file lists.

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

1 files changed, 56 insertions, 52 deletions

diff --git a/Makefile.am b/Makefile.am
index 917dfcc..112e235 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,9 @@ EXTRA_DIST = \
   CHANGES \
   CONTRIBUTORS \
   include/gtest/gtest-param-test.h.pump \
+  include/gtest/internal/gtest-param-util-generated.h.pump \
   include/gtest/internal/gtest-tuple.h.pump \
   include/gtest/internal/gtest-type-util.h.pump \
-  include/gtest/internal/gtest-param-util-generated.h.pump \
   make/Makefile \
   scripts/fuse_gtest_files.py \
   scripts/gen_gtest_pred_impl.py \
@@ -19,14 +19,14 @@ EXTRA_DIST = \
 # gtest source files that we don't compile directly.  They are
 # #included by gtest-all.cc.
 GTEST_SRC = \
-  src/gtest.cc \
   src/gtest-death-test.cc \
   src/gtest-filepath.cc \
   src/gtest-internal-inl.h \
   src/gtest-port.cc \
   src/gtest-printers.cc \
   src/gtest-test-part.cc \
-  src/gtest-typed-test.cc
+  src/gtest-typed-test.cc \
+  src/gtest.cc
 
 EXTRA_DIST += $(GTEST_SRC)
 
@@ -45,56 +45,56 @@ EXTRA_DIST += \
 # 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-listener_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-test2_test.cc \
+  test/gtest-param-test_test.cc \
+  test/gtest-param-test_test.cc \
   test/gtest-param-test_test.h \
   test/gtest-port_test.cc \
   test/gtest-printers_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-tuple_test.cc \
   test/gtest-typed-test2_test.cc \
+  test/gtest-typed-test_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_catch_exceptions_test_.cc \
   test/gtest_color_test_.cc \
   test/gtest_env_var_test_.cc \
+  test/gtest_environment_test.cc \
   test/gtest_filter_unittest_.cc \
   test/gtest_help_test_.cc \
   test/gtest_list_tests_unittest_.cc \
+  test/gtest_main_unittest.cc \
+  test/gtest_no_test_unittest.cc \
   test/gtest_output_test_.cc \
+  test/gtest_pred_impl_unittest.cc \
+  test/gtest_prod_test.cc \
+  test/gtest_repeat_test.cc \
   test/gtest_shuffle_test_.cc \
+  test/gtest_sole_header_test.cc \
+  test/gtest_stress_test.cc \
+  test/gtest_throw_on_failure_ex_test.cc \
   test/gtest_throw_on_failure_test_.cc \
   test/gtest_uninitialized_test_.cc \
+  test/gtest_unittest.cc \
+  test/gtest_unittest.cc \
   test/gtest_xml_outfile1_test_.cc \
   test/gtest_xml_outfile2_test_.cc \
-  test/gtest_xml_output_unittest_.cc
+  test/gtest_xml_output_unittest_.cc \
+  test/production.cc \
+  test/production.h
 
 # 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_catch_exceptions_test.py \
   test/gtest_color_test.py \
   test/gtest_env_var_test.py \
   test/gtest_filter_unittest.py \
@@ -104,10 +104,12 @@ EXTRA_DIST += \
   test/gtest_output_test_golden_lin.txt \
   test/gtest_output_test_golden_win.txt \
   test/gtest_shuffle_test.py \
+  test/gtest_test_utils.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/gtest_xml_output_unittest.py \
+  test/gtest_xml_test_utils.py
 
 # CMake script
 EXTRA_DIST += \
@@ -116,8 +118,8 @@ EXTRA_DIST += \
 # MSVC project files
 EXTRA_DIST += \
   msvc/gtest-md.sln \
-  msvc/gtest.sln \
   msvc/gtest-md.vcproj \
+  msvc/gtest.sln \
   msvc/gtest.vcproj \
   msvc/gtest_main-md.vcproj \
   msvc/gtest_main.vcproj \
@@ -135,27 +137,27 @@ EXTRA_DIST += \
   xcode/Config/StaticLibraryTarget.xcconfig \
   xcode/Config/TestTarget.xcconfig \
   xcode/Resources/Info.plist \
-  xcode/Scripts/versiongenerate.py \
   xcode/Scripts/runtests.sh \
+  xcode/Scripts/versiongenerate.py \
   xcode/gtest.xcodeproj/project.pbxproj
 
 # xcode sample files
 EXTRA_DIST += \
   xcode/Samples/FrameworkSample/Info.plist \
+  xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj \
   xcode/Samples/FrameworkSample/runtests.sh \
-  xcode/Samples/FrameworkSample/widget_test.cc \
   xcode/Samples/FrameworkSample/widget.cc \
   xcode/Samples/FrameworkSample/widget.h \
-  xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
+  xcode/Samples/FrameworkSample/widget_test.cc
 
 # C++Builder project files
 EXTRA_DIST += \
+  codegear/gtest.cbproj \
+  codegear/gtest.groupproj \
   codegear/gtest_all.cc \
   codegear/gtest_link.cc \
-  codegear/gtest.cbproj \
   codegear/gtest_main.cbproj \
-  codegear/gtest_unittest.cbproj \
-  codegear/gtest.groupproj
+  codegear/gtest_unittest.cbproj
 
 # Scripts and utilities
 bin_SCRIPTS = scripts/gtest-config
@@ -183,16 +185,17 @@ lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
 
 lib_libgtest_la_SOURCES = src/gtest-all.cc
 
-pkginclude_HEADERS = include/gtest/gtest.h \
-                     include/gtest/gtest-death-test.h \
-                     include/gtest/gtest-message.h \
-                     include/gtest/gtest-param-test.h \
-                     include/gtest/gtest_pred_impl.h \
-                     include/gtest/gtest-printers.h \
-                     include/gtest/gtest_prod.h \
-                     include/gtest/gtest-spi.h \
-                     include/gtest/gtest-test-part.h \
-                     include/gtest/gtest-typed-test.h
+pkginclude_HEADERS = \
+  include/gtest/gtest-death-test.h \
+  include/gtest/gtest-message.h \
+  include/gtest/gtest-param-test.h \
+  include/gtest/gtest-printers.h \
+  include/gtest/gtest-spi.h \
+  include/gtest/gtest-test-part.h \
+  include/gtest/gtest-typed-test.h \
+  include/gtest/gtest.h \
+  include/gtest/gtest_pred_impl.h \
+  include/gtest/gtest_prod.h
 
 pkginclude_internaldir = $(pkgincludedir)/internal
 pkginclude_internal_HEADERS = \
@@ -219,13 +222,14 @@ lib_libgtest_main_la_LIBADD = lib/libgtest.la
 
 noinst_LTLIBRARIES = samples/libsamples.la
 
-samples_libsamples_la_SOURCES = samples/sample1.cc \
-                                samples/sample1.h \
-                                samples/sample2.cc \
-                                samples/sample2.h \
-                                samples/sample3-inl.h \
-                                samples/sample4.cc \
-                                samples/sample4.h
+samples_libsamples_la_SOURCES = \
+  samples/sample1.cc \
+  samples/sample1.h \
+  samples/sample2.cc \
+  samples/sample2.h \
+  samples/sample3-inl.h \
+  samples/sample4.cc \
+  samples/sample4.h
 
 TESTS=
 TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
@@ -255,8 +259,8 @@ test_gtest_all_test_LDADD = lib/libgtest_main.la
 # Tests that fused gtest files compile and work.
 FUSED_GTEST_SRC = \
   fused-src/gtest/gtest-all.cc \
-  fused-src/gtest/gtest_main.cc \
-  fused-src/gtest/gtest.h
+  fused-src/gtest/gtest.h \
+  fused-src/gtest/gtest_main.cc
 
 TESTS += test/fused_gtest_test
 check_PROGRAMS += test/fused_gtest_test