diff --git a/Makefile b/Makefile index 270747e063..69b66368ee 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ include $(CORE_DEPTH)/coreconf/config.mk ####################################################################### ifdef NSS_DISABLE_GTESTS -DIRS := $(filter-out external_tests,$(DIRS)) +DIRS := $(filter-out gtests,$(DIRS)) endif ####################################################################### diff --git a/automation/taskcluster/scripts/run_clang_format.sh b/automation/taskcluster/scripts/run_clang_format.sh index 230b3a0738..c13a1553d8 100755 --- a/automation/taskcluster/scripts/run_clang_format.sh +++ b/automation/taskcluster/scripts/run_clang_format.sh @@ -40,11 +40,11 @@ else "$top/lib/ssl" \ "$top/lib/sysinit" \ "$top/lib/util" \ - "$top/external_tests/common" \ - "$top/external_tests/der_gtest" \ - "$top/external_tests/pk11_gtest" \ - "$top/external_tests/ssl_gtest" \ - "$top/external_tests/util_gtest" \ + "$top/gtests/common" \ + "$top/gtests/der_gtest" \ + "$top/gtests/pk11_gtest" \ + "$top/gtests/ssl_gtest" \ + "$top/gtests/util_gtest" \ ) fi diff --git a/external_tests/.clang-format b/gtests/.clang-format similarity index 100% rename from external_tests/.clang-format rename to gtests/.clang-format diff --git a/external_tests/Makefile b/gtests/Makefile similarity index 100% rename from external_tests/Makefile rename to gtests/Makefile diff --git a/external_tests/README b/gtests/README similarity index 100% rename from external_tests/README rename to gtests/README diff --git a/external_tests/common/Makefile b/gtests/common/Makefile similarity index 100% rename from external_tests/common/Makefile rename to gtests/common/Makefile diff --git a/external_tests/common/common.gyp b/gtests/common/common.gyp similarity index 83% rename from external_tests/common/common.gyp rename to gtests/common/common.gyp index fa10aba202..274033ad5f 100644 --- a/external_tests/common/common.gyp +++ b/gtests/common/common.gyp @@ -19,15 +19,15 @@ '<(DEPTH)/lib/util/util.gyp:nssutil3', '<(DEPTH)/lib/smime/smime.gyp:smime3', '<(DEPTH)/lib/ssl/ssl.gyp:ssl3', - '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest', + '<(DEPTH)/gtests/google_test/google_test.gyp:gtest', '<(DEPTH)/cmd/lib/lib.gyp:sectool' ] } ], 'target_defaults': { 'include_dirs': [ - '../../external_tests/google_test/gtest/include', - '../../external_tests/common' + '../../gtests/google_test/gtest/include', + '../../gtests/common' ], }, 'variables': { diff --git a/external_tests/common/gtest.gypi b/gtests/common/gtest.gypi similarity index 100% rename from external_tests/common/gtest.gypi rename to gtests/common/gtest.gypi diff --git a/external_tests/common/gtest.mk b/gtests/common/gtest.mk similarity index 100% rename from external_tests/common/gtest.mk rename to gtests/common/gtest.mk diff --git a/external_tests/common/gtests.cc b/gtests/common/gtests.cc similarity index 100% rename from external_tests/common/gtests.cc rename to gtests/common/gtests.cc diff --git a/external_tests/common/manifest.mn b/gtests/common/manifest.mn similarity index 76% rename from external_tests/common/manifest.mn rename to gtests/common/manifest.mn index bf45ebc0a3..9834e42a05 100644 --- a/external_tests/common/manifest.mn +++ b/gtests/common/manifest.mn @@ -10,12 +10,12 @@ CPPSRCS = \ gtests.cc \ $(NULL) -INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \ - -I$(CORE_DEPTH)/external_tests/common +INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \ + -I$(CORE_DEPTH)/gtests/common REQUIRES = gtest EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) # NOTE: this is not actually used but required to build gtests.o -PROGRAM = gtests \ No newline at end of file +PROGRAM = gtests diff --git a/external_tests/common/scoped_ptrs.h b/gtests/common/scoped_ptrs.h similarity index 100% rename from external_tests/common/scoped_ptrs.h rename to gtests/common/scoped_ptrs.h diff --git a/external_tests/der_gtest/Makefile b/gtests/der_gtest/Makefile similarity index 100% rename from external_tests/der_gtest/Makefile rename to gtests/der_gtest/Makefile diff --git a/external_tests/der_gtest/der_getint_unittest.cc b/gtests/der_gtest/der_getint_unittest.cc similarity index 100% rename from external_tests/der_gtest/der_getint_unittest.cc rename to gtests/der_gtest/der_getint_unittest.cc diff --git a/external_tests/der_gtest/der_gtest.gyp b/gtests/der_gtest/der_gtest.gyp similarity index 74% rename from external_tests/der_gtest/der_gtest.gyp rename to gtests/der_gtest/der_gtest.gyp index 2d60bb6ac7..1851a706ed 100644 --- a/external_tests/der_gtest/der_gtest.gyp +++ b/gtests/der_gtest/der_gtest.gyp @@ -12,18 +12,18 @@ 'type': 'executable', 'sources': [ 'der_getint_unittest.cc', - '<(DEPTH)/external_tests/common/gtests.cc' + '<(DEPTH)/gtests/common/gtests.cc' ], 'dependencies': [ '<(DEPTH)/exports.gyp:nss_exports', - '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest', + '<(DEPTH)/gtests/google_test/google_test.gyp:gtest', ] } ], 'target_defaults': { 'include_dirs': [ - '../../external_tests/google_test/gtest/include', - '../../external_tests/common' + '../../gtests/google_test/gtest/include', + '../../gtests/common' ] }, 'variables': { diff --git a/external_tests/der_gtest/der_private_key_import_unittest.cc b/gtests/der_gtest/der_private_key_import_unittest.cc similarity index 100% rename from external_tests/der_gtest/der_private_key_import_unittest.cc rename to gtests/der_gtest/der_private_key_import_unittest.cc diff --git a/external_tests/der_gtest/manifest.mn b/gtests/der_gtest/manifest.mn similarity index 81% rename from external_tests/der_gtest/manifest.mn rename to gtests/der_gtest/manifest.mn index 31f840f39b..862692f56b 100644 --- a/external_tests/der_gtest/manifest.mn +++ b/gtests/der_gtest/manifest.mn @@ -11,8 +11,8 @@ CPPSRCS = \ der_private_key_import_unittest.cc \ $(NULL) -INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \ - -I$(CORE_DEPTH)/external_tests/common +INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \ + -I$(CORE_DEPTH)/gtests/common REQUIRES = nspr nss libdbm gtest diff --git a/external_tests/google_test/Makefile b/gtests/google_test/Makefile similarity index 100% rename from external_tests/google_test/Makefile rename to gtests/google_test/Makefile diff --git a/external_tests/google_test/google_test.gyp b/gtests/google_test/google_test.gyp similarity index 100% rename from external_tests/google_test/google_test.gyp rename to gtests/google_test/google_test.gyp diff --git a/external_tests/google_test/gtest/CHANGES b/gtests/google_test/gtest/CHANGES similarity index 100% rename from external_tests/google_test/gtest/CHANGES rename to gtests/google_test/gtest/CHANGES diff --git a/external_tests/google_test/gtest/CMakeLists.txt b/gtests/google_test/gtest/CMakeLists.txt similarity index 100% rename from external_tests/google_test/gtest/CMakeLists.txt rename to gtests/google_test/gtest/CMakeLists.txt diff --git a/external_tests/google_test/gtest/CONTRIBUTORS b/gtests/google_test/gtest/CONTRIBUTORS similarity index 100% rename from external_tests/google_test/gtest/CONTRIBUTORS rename to gtests/google_test/gtest/CONTRIBUTORS diff --git a/external_tests/google_test/gtest/LICENSE b/gtests/google_test/gtest/LICENSE similarity index 100% rename from external_tests/google_test/gtest/LICENSE rename to gtests/google_test/gtest/LICENSE diff --git a/external_tests/google_test/gtest/Makefile.am b/gtests/google_test/gtest/Makefile.am similarity index 100% rename from external_tests/google_test/gtest/Makefile.am rename to gtests/google_test/gtest/Makefile.am diff --git a/external_tests/google_test/gtest/README b/gtests/google_test/gtest/README similarity index 100% rename from external_tests/google_test/gtest/README rename to gtests/google_test/gtest/README diff --git a/external_tests/google_test/gtest/build-aux/.keep b/gtests/google_test/gtest/build-aux/.keep similarity index 100% rename from external_tests/google_test/gtest/build-aux/.keep rename to gtests/google_test/gtest/build-aux/.keep diff --git a/external_tests/google_test/gtest/cmake/internal_utils.cmake b/gtests/google_test/gtest/cmake/internal_utils.cmake similarity index 100% rename from external_tests/google_test/gtest/cmake/internal_utils.cmake rename to gtests/google_test/gtest/cmake/internal_utils.cmake diff --git a/external_tests/google_test/gtest/codegear/gtest.cbproj b/gtests/google_test/gtest/codegear/gtest.cbproj similarity index 100% rename from external_tests/google_test/gtest/codegear/gtest.cbproj rename to gtests/google_test/gtest/codegear/gtest.cbproj diff --git a/external_tests/google_test/gtest/codegear/gtest.groupproj b/gtests/google_test/gtest/codegear/gtest.groupproj similarity index 100% rename from external_tests/google_test/gtest/codegear/gtest.groupproj rename to gtests/google_test/gtest/codegear/gtest.groupproj diff --git a/external_tests/google_test/gtest/codegear/gtest_all.cc b/gtests/google_test/gtest/codegear/gtest_all.cc similarity index 100% rename from external_tests/google_test/gtest/codegear/gtest_all.cc rename to gtests/google_test/gtest/codegear/gtest_all.cc diff --git a/external_tests/google_test/gtest/codegear/gtest_link.cc b/gtests/google_test/gtest/codegear/gtest_link.cc similarity index 100% rename from external_tests/google_test/gtest/codegear/gtest_link.cc rename to gtests/google_test/gtest/codegear/gtest_link.cc diff --git a/external_tests/google_test/gtest/codegear/gtest_main.cbproj b/gtests/google_test/gtest/codegear/gtest_main.cbproj similarity index 100% rename from external_tests/google_test/gtest/codegear/gtest_main.cbproj rename to gtests/google_test/gtest/codegear/gtest_main.cbproj diff --git a/external_tests/google_test/gtest/codegear/gtest_unittest.cbproj b/gtests/google_test/gtest/codegear/gtest_unittest.cbproj similarity index 100% rename from external_tests/google_test/gtest/codegear/gtest_unittest.cbproj rename to gtests/google_test/gtest/codegear/gtest_unittest.cbproj diff --git a/external_tests/google_test/gtest/configure.ac b/gtests/google_test/gtest/configure.ac similarity index 100% rename from external_tests/google_test/gtest/configure.ac rename to gtests/google_test/gtest/configure.ac diff --git a/external_tests/google_test/gtest/include/gtest/gtest-death-test.h b/gtests/google_test/gtest/include/gtest/gtest-death-test.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest-death-test.h rename to gtests/google_test/gtest/include/gtest/gtest-death-test.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest-message.h b/gtests/google_test/gtest/include/gtest/gtest-message.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest-message.h rename to gtests/google_test/gtest/include/gtest/gtest-message.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest-param-test.h b/gtests/google_test/gtest/include/gtest/gtest-param-test.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest-param-test.h rename to gtests/google_test/gtest/include/gtest/gtest-param-test.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest-param-test.h.pump b/gtests/google_test/gtest/include/gtest/gtest-param-test.h.pump similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest-param-test.h.pump rename to gtests/google_test/gtest/include/gtest/gtest-param-test.h.pump diff --git a/external_tests/google_test/gtest/include/gtest/gtest-printers.h b/gtests/google_test/gtest/include/gtest/gtest-printers.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest-printers.h rename to gtests/google_test/gtest/include/gtest/gtest-printers.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest-spi.h b/gtests/google_test/gtest/include/gtest/gtest-spi.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest-spi.h rename to gtests/google_test/gtest/include/gtest/gtest-spi.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest-test-part.h b/gtests/google_test/gtest/include/gtest/gtest-test-part.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest-test-part.h rename to gtests/google_test/gtest/include/gtest/gtest-test-part.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest-typed-test.h b/gtests/google_test/gtest/include/gtest/gtest-typed-test.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest-typed-test.h rename to gtests/google_test/gtest/include/gtest/gtest-typed-test.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest.h b/gtests/google_test/gtest/include/gtest/gtest.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest.h rename to gtests/google_test/gtest/include/gtest/gtest.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest_pred_impl.h b/gtests/google_test/gtest/include/gtest/gtest_pred_impl.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest_pred_impl.h rename to gtests/google_test/gtest/include/gtest/gtest_pred_impl.h diff --git a/external_tests/google_test/gtest/include/gtest/gtest_prod.h b/gtests/google_test/gtest/include/gtest/gtest_prod.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/gtest_prod.h rename to gtests/google_test/gtest/include/gtest/gtest_prod.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h b/gtests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-filepath.h b/gtests/google_test/gtest/include/gtest/internal/gtest-filepath.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-filepath.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-filepath.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h b/gtests/google_test/gtest/include/gtest/internal/gtest-internal.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-internal.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h b/gtests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump rename to gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util.h b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-param-util.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-param-util.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-port.h b/gtests/google_test/gtest/include/gtest/internal/gtest-port.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-port.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-port.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-string.h b/gtests/google_test/gtest/include/gtest/internal/gtest-string.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-string.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-string.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h b/gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump b/gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump rename to gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h b/gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h rename to gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump b/gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump similarity index 100% rename from external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump rename to gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump diff --git a/external_tests/google_test/gtest/m4/acx_pthread.m4 b/gtests/google_test/gtest/m4/acx_pthread.m4 similarity index 100% rename from external_tests/google_test/gtest/m4/acx_pthread.m4 rename to gtests/google_test/gtest/m4/acx_pthread.m4 diff --git a/external_tests/google_test/gtest/m4/gtest.m4 b/gtests/google_test/gtest/m4/gtest.m4 similarity index 100% rename from external_tests/google_test/gtest/m4/gtest.m4 rename to gtests/google_test/gtest/m4/gtest.m4 diff --git a/external_tests/google_test/gtest/make/Makefile b/gtests/google_test/gtest/make/Makefile similarity index 100% rename from external_tests/google_test/gtest/make/Makefile rename to gtests/google_test/gtest/make/Makefile diff --git a/external_tests/google_test/gtest/msvc/gtest-md.sln b/gtests/google_test/gtest/msvc/gtest-md.sln similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest-md.sln rename to gtests/google_test/gtest/msvc/gtest-md.sln diff --git a/external_tests/google_test/gtest/msvc/gtest-md.vcproj b/gtests/google_test/gtest/msvc/gtest-md.vcproj similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest-md.vcproj rename to gtests/google_test/gtest/msvc/gtest-md.vcproj diff --git a/external_tests/google_test/gtest/msvc/gtest.sln b/gtests/google_test/gtest/msvc/gtest.sln similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest.sln rename to gtests/google_test/gtest/msvc/gtest.sln diff --git a/external_tests/google_test/gtest/msvc/gtest.vcproj b/gtests/google_test/gtest/msvc/gtest.vcproj similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest.vcproj rename to gtests/google_test/gtest/msvc/gtest.vcproj diff --git a/external_tests/google_test/gtest/msvc/gtest_main-md.vcproj b/gtests/google_test/gtest/msvc/gtest_main-md.vcproj similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest_main-md.vcproj rename to gtests/google_test/gtest/msvc/gtest_main-md.vcproj diff --git a/external_tests/google_test/gtest/msvc/gtest_main.vcproj b/gtests/google_test/gtest/msvc/gtest_main.vcproj similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest_main.vcproj rename to gtests/google_test/gtest/msvc/gtest_main.vcproj diff --git a/external_tests/google_test/gtest/msvc/gtest_prod_test-md.vcproj b/gtests/google_test/gtest/msvc/gtest_prod_test-md.vcproj similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest_prod_test-md.vcproj rename to gtests/google_test/gtest/msvc/gtest_prod_test-md.vcproj diff --git a/external_tests/google_test/gtest/msvc/gtest_prod_test.vcproj b/gtests/google_test/gtest/msvc/gtest_prod_test.vcproj similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest_prod_test.vcproj rename to gtests/google_test/gtest/msvc/gtest_prod_test.vcproj diff --git a/external_tests/google_test/gtest/msvc/gtest_unittest-md.vcproj b/gtests/google_test/gtest/msvc/gtest_unittest-md.vcproj similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest_unittest-md.vcproj rename to gtests/google_test/gtest/msvc/gtest_unittest-md.vcproj diff --git a/external_tests/google_test/gtest/msvc/gtest_unittest.vcproj b/gtests/google_test/gtest/msvc/gtest_unittest.vcproj similarity index 100% rename from external_tests/google_test/gtest/msvc/gtest_unittest.vcproj rename to gtests/google_test/gtest/msvc/gtest_unittest.vcproj diff --git a/external_tests/google_test/gtest/samples/prime_tables.h b/gtests/google_test/gtest/samples/prime_tables.h similarity index 100% rename from external_tests/google_test/gtest/samples/prime_tables.h rename to gtests/google_test/gtest/samples/prime_tables.h diff --git a/external_tests/google_test/gtest/samples/sample1.cc b/gtests/google_test/gtest/samples/sample1.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample1.cc rename to gtests/google_test/gtest/samples/sample1.cc diff --git a/external_tests/google_test/gtest/samples/sample1.h b/gtests/google_test/gtest/samples/sample1.h similarity index 100% rename from external_tests/google_test/gtest/samples/sample1.h rename to gtests/google_test/gtest/samples/sample1.h diff --git a/external_tests/google_test/gtest/samples/sample10_unittest.cc b/gtests/google_test/gtest/samples/sample10_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample10_unittest.cc rename to gtests/google_test/gtest/samples/sample10_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample1_unittest.cc b/gtests/google_test/gtest/samples/sample1_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample1_unittest.cc rename to gtests/google_test/gtest/samples/sample1_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample2.cc b/gtests/google_test/gtest/samples/sample2.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample2.cc rename to gtests/google_test/gtest/samples/sample2.cc diff --git a/external_tests/google_test/gtest/samples/sample2.h b/gtests/google_test/gtest/samples/sample2.h similarity index 100% rename from external_tests/google_test/gtest/samples/sample2.h rename to gtests/google_test/gtest/samples/sample2.h diff --git a/external_tests/google_test/gtest/samples/sample2_unittest.cc b/gtests/google_test/gtest/samples/sample2_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample2_unittest.cc rename to gtests/google_test/gtest/samples/sample2_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample3-inl.h b/gtests/google_test/gtest/samples/sample3-inl.h similarity index 100% rename from external_tests/google_test/gtest/samples/sample3-inl.h rename to gtests/google_test/gtest/samples/sample3-inl.h diff --git a/external_tests/google_test/gtest/samples/sample3_unittest.cc b/gtests/google_test/gtest/samples/sample3_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample3_unittest.cc rename to gtests/google_test/gtest/samples/sample3_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample4.cc b/gtests/google_test/gtest/samples/sample4.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample4.cc rename to gtests/google_test/gtest/samples/sample4.cc diff --git a/external_tests/google_test/gtest/samples/sample4.h b/gtests/google_test/gtest/samples/sample4.h similarity index 100% rename from external_tests/google_test/gtest/samples/sample4.h rename to gtests/google_test/gtest/samples/sample4.h diff --git a/external_tests/google_test/gtest/samples/sample4_unittest.cc b/gtests/google_test/gtest/samples/sample4_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample4_unittest.cc rename to gtests/google_test/gtest/samples/sample4_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample5_unittest.cc b/gtests/google_test/gtest/samples/sample5_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample5_unittest.cc rename to gtests/google_test/gtest/samples/sample5_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample6_unittest.cc b/gtests/google_test/gtest/samples/sample6_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample6_unittest.cc rename to gtests/google_test/gtest/samples/sample6_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample7_unittest.cc b/gtests/google_test/gtest/samples/sample7_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample7_unittest.cc rename to gtests/google_test/gtest/samples/sample7_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample8_unittest.cc b/gtests/google_test/gtest/samples/sample8_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample8_unittest.cc rename to gtests/google_test/gtest/samples/sample8_unittest.cc diff --git a/external_tests/google_test/gtest/samples/sample9_unittest.cc b/gtests/google_test/gtest/samples/sample9_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/samples/sample9_unittest.cc rename to gtests/google_test/gtest/samples/sample9_unittest.cc diff --git a/external_tests/google_test/gtest/scripts/common.py b/gtests/google_test/gtest/scripts/common.py similarity index 100% rename from external_tests/google_test/gtest/scripts/common.py rename to gtests/google_test/gtest/scripts/common.py diff --git a/external_tests/google_test/gtest/scripts/fuse_gtest_files.py b/gtests/google_test/gtest/scripts/fuse_gtest_files.py similarity index 100% rename from external_tests/google_test/gtest/scripts/fuse_gtest_files.py rename to gtests/google_test/gtest/scripts/fuse_gtest_files.py diff --git a/external_tests/google_test/gtest/scripts/gen_gtest_pred_impl.py b/gtests/google_test/gtest/scripts/gen_gtest_pred_impl.py similarity index 100% rename from external_tests/google_test/gtest/scripts/gen_gtest_pred_impl.py rename to gtests/google_test/gtest/scripts/gen_gtest_pred_impl.py diff --git a/external_tests/google_test/gtest/scripts/gtest-config.in b/gtests/google_test/gtest/scripts/gtest-config.in similarity index 100% rename from external_tests/google_test/gtest/scripts/gtest-config.in rename to gtests/google_test/gtest/scripts/gtest-config.in diff --git a/external_tests/google_test/gtest/scripts/pump.py b/gtests/google_test/gtest/scripts/pump.py similarity index 100% rename from external_tests/google_test/gtest/scripts/pump.py rename to gtests/google_test/gtest/scripts/pump.py diff --git a/external_tests/google_test/gtest/scripts/release_docs.py b/gtests/google_test/gtest/scripts/release_docs.py similarity index 100% rename from external_tests/google_test/gtest/scripts/release_docs.py rename to gtests/google_test/gtest/scripts/release_docs.py diff --git a/external_tests/google_test/gtest/scripts/test/Makefile b/gtests/google_test/gtest/scripts/test/Makefile similarity index 100% rename from external_tests/google_test/gtest/scripts/test/Makefile rename to gtests/google_test/gtest/scripts/test/Makefile diff --git a/external_tests/google_test/gtest/scripts/upload.py b/gtests/google_test/gtest/scripts/upload.py similarity index 100% rename from external_tests/google_test/gtest/scripts/upload.py rename to gtests/google_test/gtest/scripts/upload.py diff --git a/external_tests/google_test/gtest/scripts/upload_gtest.py b/gtests/google_test/gtest/scripts/upload_gtest.py similarity index 100% rename from external_tests/google_test/gtest/scripts/upload_gtest.py rename to gtests/google_test/gtest/scripts/upload_gtest.py diff --git a/external_tests/google_test/gtest/src/gtest-all.cc b/gtests/google_test/gtest/src/gtest-all.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest-all.cc rename to gtests/google_test/gtest/src/gtest-all.cc diff --git a/external_tests/google_test/gtest/src/gtest-death-test.cc b/gtests/google_test/gtest/src/gtest-death-test.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest-death-test.cc rename to gtests/google_test/gtest/src/gtest-death-test.cc diff --git a/external_tests/google_test/gtest/src/gtest-filepath.cc b/gtests/google_test/gtest/src/gtest-filepath.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest-filepath.cc rename to gtests/google_test/gtest/src/gtest-filepath.cc diff --git a/external_tests/google_test/gtest/src/gtest-internal-inl.h b/gtests/google_test/gtest/src/gtest-internal-inl.h similarity index 100% rename from external_tests/google_test/gtest/src/gtest-internal-inl.h rename to gtests/google_test/gtest/src/gtest-internal-inl.h diff --git a/external_tests/google_test/gtest/src/gtest-port.cc b/gtests/google_test/gtest/src/gtest-port.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest-port.cc rename to gtests/google_test/gtest/src/gtest-port.cc diff --git a/external_tests/google_test/gtest/src/gtest-printers.cc b/gtests/google_test/gtest/src/gtest-printers.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest-printers.cc rename to gtests/google_test/gtest/src/gtest-printers.cc diff --git a/external_tests/google_test/gtest/src/gtest-test-part.cc b/gtests/google_test/gtest/src/gtest-test-part.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest-test-part.cc rename to gtests/google_test/gtest/src/gtest-test-part.cc diff --git a/external_tests/google_test/gtest/src/gtest-typed-test.cc b/gtests/google_test/gtest/src/gtest-typed-test.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest-typed-test.cc rename to gtests/google_test/gtest/src/gtest-typed-test.cc diff --git a/external_tests/google_test/gtest/src/gtest.cc b/gtests/google_test/gtest/src/gtest.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest.cc rename to gtests/google_test/gtest/src/gtest.cc diff --git a/external_tests/google_test/gtest/src/gtest_main.cc b/gtests/google_test/gtest/src/gtest_main.cc similarity index 100% rename from external_tests/google_test/gtest/src/gtest_main.cc rename to gtests/google_test/gtest/src/gtest_main.cc diff --git a/external_tests/google_test/gtest/test/gtest-death-test_ex_test.cc b/gtests/google_test/gtest/test/gtest-death-test_ex_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-death-test_ex_test.cc rename to gtests/google_test/gtest/test/gtest-death-test_ex_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-death-test_test.cc b/gtests/google_test/gtest/test/gtest-death-test_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-death-test_test.cc rename to gtests/google_test/gtest/test/gtest-death-test_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-filepath_test.cc b/gtests/google_test/gtest/test/gtest-filepath_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-filepath_test.cc rename to gtests/google_test/gtest/test/gtest-filepath_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-linked_ptr_test.cc b/gtests/google_test/gtest/test/gtest-linked_ptr_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-linked_ptr_test.cc rename to gtests/google_test/gtest/test/gtest-linked_ptr_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-listener_test.cc b/gtests/google_test/gtest/test/gtest-listener_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-listener_test.cc rename to gtests/google_test/gtest/test/gtest-listener_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-message_test.cc b/gtests/google_test/gtest/test/gtest-message_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-message_test.cc rename to gtests/google_test/gtest/test/gtest-message_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-options_test.cc b/gtests/google_test/gtest/test/gtest-options_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-options_test.cc rename to gtests/google_test/gtest/test/gtest-options_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-param-test2_test.cc b/gtests/google_test/gtest/test/gtest-param-test2_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-param-test2_test.cc rename to gtests/google_test/gtest/test/gtest-param-test2_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-param-test_test.cc b/gtests/google_test/gtest/test/gtest-param-test_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-param-test_test.cc rename to gtests/google_test/gtest/test/gtest-param-test_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-param-test_test.h b/gtests/google_test/gtest/test/gtest-param-test_test.h similarity index 100% rename from external_tests/google_test/gtest/test/gtest-param-test_test.h rename to gtests/google_test/gtest/test/gtest-param-test_test.h diff --git a/external_tests/google_test/gtest/test/gtest-port_test.cc b/gtests/google_test/gtest/test/gtest-port_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-port_test.cc rename to gtests/google_test/gtest/test/gtest-port_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-printers_test.cc b/gtests/google_test/gtest/test/gtest-printers_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-printers_test.cc rename to gtests/google_test/gtest/test/gtest-printers_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-test-part_test.cc b/gtests/google_test/gtest/test/gtest-test-part_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-test-part_test.cc rename to gtests/google_test/gtest/test/gtest-test-part_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-tuple_test.cc b/gtests/google_test/gtest/test/gtest-tuple_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-tuple_test.cc rename to gtests/google_test/gtest/test/gtest-tuple_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-typed-test2_test.cc b/gtests/google_test/gtest/test/gtest-typed-test2_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-typed-test2_test.cc rename to gtests/google_test/gtest/test/gtest-typed-test2_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-typed-test_test.cc b/gtests/google_test/gtest/test/gtest-typed-test_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-typed-test_test.cc rename to gtests/google_test/gtest/test/gtest-typed-test_test.cc diff --git a/external_tests/google_test/gtest/test/gtest-typed-test_test.h b/gtests/google_test/gtest/test/gtest-typed-test_test.h similarity index 100% rename from external_tests/google_test/gtest/test/gtest-typed-test_test.h rename to gtests/google_test/gtest/test/gtest-typed-test_test.h diff --git a/external_tests/google_test/gtest/test/gtest-unittest-api_test.cc b/gtests/google_test/gtest/test/gtest-unittest-api_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest-unittest-api_test.cc rename to gtests/google_test/gtest/test/gtest-unittest-api_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_all_test.cc b/gtests/google_test/gtest/test/gtest_all_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_all_test.cc rename to gtests/google_test/gtest/test/gtest_all_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_break_on_failure_unittest.py b/gtests/google_test/gtest/test/gtest_break_on_failure_unittest.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_break_on_failure_unittest.py rename to gtests/google_test/gtest/test/gtest_break_on_failure_unittest.py diff --git a/external_tests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc b/gtests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc rename to gtests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc diff --git a/external_tests/google_test/gtest/test/gtest_catch_exceptions_test.py b/gtests/google_test/gtest/test/gtest_catch_exceptions_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_catch_exceptions_test.py rename to gtests/google_test/gtest/test/gtest_catch_exceptions_test.py diff --git a/external_tests/google_test/gtest/test/gtest_catch_exceptions_test_.cc b/gtests/google_test/gtest/test/gtest_catch_exceptions_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_catch_exceptions_test_.cc rename to gtests/google_test/gtest/test/gtest_catch_exceptions_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_color_test.py b/gtests/google_test/gtest/test/gtest_color_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_color_test.py rename to gtests/google_test/gtest/test/gtest_color_test.py diff --git a/external_tests/google_test/gtest/test/gtest_color_test_.cc b/gtests/google_test/gtest/test/gtest_color_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_color_test_.cc rename to gtests/google_test/gtest/test/gtest_color_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_env_var_test.py b/gtests/google_test/gtest/test/gtest_env_var_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_env_var_test.py rename to gtests/google_test/gtest/test/gtest_env_var_test.py diff --git a/external_tests/google_test/gtest/test/gtest_env_var_test_.cc b/gtests/google_test/gtest/test/gtest_env_var_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_env_var_test_.cc rename to gtests/google_test/gtest/test/gtest_env_var_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_environment_test.cc b/gtests/google_test/gtest/test/gtest_environment_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_environment_test.cc rename to gtests/google_test/gtest/test/gtest_environment_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_filter_unittest.py b/gtests/google_test/gtest/test/gtest_filter_unittest.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_filter_unittest.py rename to gtests/google_test/gtest/test/gtest_filter_unittest.py diff --git a/external_tests/google_test/gtest/test/gtest_filter_unittest_.cc b/gtests/google_test/gtest/test/gtest_filter_unittest_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_filter_unittest_.cc rename to gtests/google_test/gtest/test/gtest_filter_unittest_.cc diff --git a/external_tests/google_test/gtest/test/gtest_help_test.py b/gtests/google_test/gtest/test/gtest_help_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_help_test.py rename to gtests/google_test/gtest/test/gtest_help_test.py diff --git a/external_tests/google_test/gtest/test/gtest_help_test_.cc b/gtests/google_test/gtest/test/gtest_help_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_help_test_.cc rename to gtests/google_test/gtest/test/gtest_help_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_list_tests_unittest.py b/gtests/google_test/gtest/test/gtest_list_tests_unittest.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_list_tests_unittest.py rename to gtests/google_test/gtest/test/gtest_list_tests_unittest.py diff --git a/external_tests/google_test/gtest/test/gtest_list_tests_unittest_.cc b/gtests/google_test/gtest/test/gtest_list_tests_unittest_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_list_tests_unittest_.cc rename to gtests/google_test/gtest/test/gtest_list_tests_unittest_.cc diff --git a/external_tests/google_test/gtest/test/gtest_main_unittest.cc b/gtests/google_test/gtest/test/gtest_main_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_main_unittest.cc rename to gtests/google_test/gtest/test/gtest_main_unittest.cc diff --git a/external_tests/google_test/gtest/test/gtest_no_test_unittest.cc b/gtests/google_test/gtest/test/gtest_no_test_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_no_test_unittest.cc rename to gtests/google_test/gtest/test/gtest_no_test_unittest.cc diff --git a/external_tests/google_test/gtest/test/gtest_output_test.py b/gtests/google_test/gtest/test/gtest_output_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_output_test.py rename to gtests/google_test/gtest/test/gtest_output_test.py diff --git a/external_tests/google_test/gtest/test/gtest_output_test_.cc b/gtests/google_test/gtest/test/gtest_output_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_output_test_.cc rename to gtests/google_test/gtest/test/gtest_output_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_output_test_golden_lin.txt b/gtests/google_test/gtest/test/gtest_output_test_golden_lin.txt similarity index 100% rename from external_tests/google_test/gtest/test/gtest_output_test_golden_lin.txt rename to gtests/google_test/gtest/test/gtest_output_test_golden_lin.txt diff --git a/external_tests/google_test/gtest/test/gtest_pred_impl_unittest.cc b/gtests/google_test/gtest/test/gtest_pred_impl_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_pred_impl_unittest.cc rename to gtests/google_test/gtest/test/gtest_pred_impl_unittest.cc diff --git a/external_tests/google_test/gtest/test/gtest_premature_exit_test.cc b/gtests/google_test/gtest/test/gtest_premature_exit_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_premature_exit_test.cc rename to gtests/google_test/gtest/test/gtest_premature_exit_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_prod_test.cc b/gtests/google_test/gtest/test/gtest_prod_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_prod_test.cc rename to gtests/google_test/gtest/test/gtest_prod_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_repeat_test.cc b/gtests/google_test/gtest/test/gtest_repeat_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_repeat_test.cc rename to gtests/google_test/gtest/test/gtest_repeat_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_shuffle_test.py b/gtests/google_test/gtest/test/gtest_shuffle_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_shuffle_test.py rename to gtests/google_test/gtest/test/gtest_shuffle_test.py diff --git a/external_tests/google_test/gtest/test/gtest_shuffle_test_.cc b/gtests/google_test/gtest/test/gtest_shuffle_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_shuffle_test_.cc rename to gtests/google_test/gtest/test/gtest_shuffle_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_sole_header_test.cc b/gtests/google_test/gtest/test/gtest_sole_header_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_sole_header_test.cc rename to gtests/google_test/gtest/test/gtest_sole_header_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_stress_test.cc b/gtests/google_test/gtest/test/gtest_stress_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_stress_test.cc rename to gtests/google_test/gtest/test/gtest_stress_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_test_utils.py b/gtests/google_test/gtest/test/gtest_test_utils.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_test_utils.py rename to gtests/google_test/gtest/test/gtest_test_utils.py diff --git a/external_tests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc b/gtests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc rename to gtests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc diff --git a/external_tests/google_test/gtest/test/gtest_throw_on_failure_test.py b/gtests/google_test/gtest/test/gtest_throw_on_failure_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_throw_on_failure_test.py rename to gtests/google_test/gtest/test/gtest_throw_on_failure_test.py diff --git a/external_tests/google_test/gtest/test/gtest_throw_on_failure_test_.cc b/gtests/google_test/gtest/test/gtest_throw_on_failure_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_throw_on_failure_test_.cc rename to gtests/google_test/gtest/test/gtest_throw_on_failure_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_uninitialized_test.py b/gtests/google_test/gtest/test/gtest_uninitialized_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_uninitialized_test.py rename to gtests/google_test/gtest/test/gtest_uninitialized_test.py diff --git a/external_tests/google_test/gtest/test/gtest_uninitialized_test_.cc b/gtests/google_test/gtest/test/gtest_uninitialized_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_uninitialized_test_.cc rename to gtests/google_test/gtest/test/gtest_uninitialized_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_unittest.cc b/gtests/google_test/gtest/test/gtest_unittest.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_unittest.cc rename to gtests/google_test/gtest/test/gtest_unittest.cc diff --git a/external_tests/google_test/gtest/test/gtest_xml_outfile1_test_.cc b/gtests/google_test/gtest/test/gtest_xml_outfile1_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_xml_outfile1_test_.cc rename to gtests/google_test/gtest/test/gtest_xml_outfile1_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_xml_outfile2_test_.cc b/gtests/google_test/gtest/test/gtest_xml_outfile2_test_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_xml_outfile2_test_.cc rename to gtests/google_test/gtest/test/gtest_xml_outfile2_test_.cc diff --git a/external_tests/google_test/gtest/test/gtest_xml_outfiles_test.py b/gtests/google_test/gtest/test/gtest_xml_outfiles_test.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_xml_outfiles_test.py rename to gtests/google_test/gtest/test/gtest_xml_outfiles_test.py diff --git a/external_tests/google_test/gtest/test/gtest_xml_output_unittest.py b/gtests/google_test/gtest/test/gtest_xml_output_unittest.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_xml_output_unittest.py rename to gtests/google_test/gtest/test/gtest_xml_output_unittest.py diff --git a/external_tests/google_test/gtest/test/gtest_xml_output_unittest_.cc b/gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc similarity index 100% rename from external_tests/google_test/gtest/test/gtest_xml_output_unittest_.cc rename to gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc diff --git a/external_tests/google_test/gtest/test/gtest_xml_test_utils.py b/gtests/google_test/gtest/test/gtest_xml_test_utils.py similarity index 100% rename from external_tests/google_test/gtest/test/gtest_xml_test_utils.py rename to gtests/google_test/gtest/test/gtest_xml_test_utils.py diff --git a/external_tests/google_test/gtest/test/production.cc b/gtests/google_test/gtest/test/production.cc similarity index 100% rename from external_tests/google_test/gtest/test/production.cc rename to gtests/google_test/gtest/test/production.cc diff --git a/external_tests/google_test/gtest/test/production.h b/gtests/google_test/gtest/test/production.h similarity index 100% rename from external_tests/google_test/gtest/test/production.h rename to gtests/google_test/gtest/test/production.h diff --git a/external_tests/google_test/gtest/xcode/Config/DebugProject.xcconfig b/gtests/google_test/gtest/xcode/Config/DebugProject.xcconfig similarity index 100% rename from external_tests/google_test/gtest/xcode/Config/DebugProject.xcconfig rename to gtests/google_test/gtest/xcode/Config/DebugProject.xcconfig diff --git a/external_tests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig b/gtests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig similarity index 100% rename from external_tests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig rename to gtests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig diff --git a/external_tests/google_test/gtest/xcode/Config/General.xcconfig b/gtests/google_test/gtest/xcode/Config/General.xcconfig similarity index 100% rename from external_tests/google_test/gtest/xcode/Config/General.xcconfig rename to gtests/google_test/gtest/xcode/Config/General.xcconfig diff --git a/external_tests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig b/gtests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig similarity index 100% rename from external_tests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig rename to gtests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig diff --git a/external_tests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig b/gtests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig similarity index 100% rename from external_tests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig rename to gtests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig diff --git a/external_tests/google_test/gtest/xcode/Config/TestTarget.xcconfig b/gtests/google_test/gtest/xcode/Config/TestTarget.xcconfig similarity index 100% rename from external_tests/google_test/gtest/xcode/Config/TestTarget.xcconfig rename to gtests/google_test/gtest/xcode/Config/TestTarget.xcconfig diff --git a/external_tests/google_test/gtest/xcode/Resources/Info.plist b/gtests/google_test/gtest/xcode/Resources/Info.plist similarity index 100% rename from external_tests/google_test/gtest/xcode/Resources/Info.plist rename to gtests/google_test/gtest/xcode/Resources/Info.plist diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist similarity index 100% rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj similarity index 100% rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh similarity index 100% rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc similarity index 100% rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h similarity index 100% rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc similarity index 100% rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc diff --git a/external_tests/google_test/gtest/xcode/Scripts/runtests.sh b/gtests/google_test/gtest/xcode/Scripts/runtests.sh similarity index 100% rename from external_tests/google_test/gtest/xcode/Scripts/runtests.sh rename to gtests/google_test/gtest/xcode/Scripts/runtests.sh diff --git a/external_tests/google_test/gtest/xcode/Scripts/versiongenerate.py b/gtests/google_test/gtest/xcode/Scripts/versiongenerate.py similarity index 100% rename from external_tests/google_test/gtest/xcode/Scripts/versiongenerate.py rename to gtests/google_test/gtest/xcode/Scripts/versiongenerate.py diff --git a/external_tests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj b/gtests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj similarity index 100% rename from external_tests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj rename to gtests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj diff --git a/external_tests/google_test/manifest.mn b/gtests/google_test/manifest.mn similarity index 100% rename from external_tests/google_test/manifest.mn rename to gtests/google_test/manifest.mn diff --git a/external_tests/manifest.mn b/gtests/manifest.mn similarity index 100% rename from external_tests/manifest.mn rename to gtests/manifest.mn diff --git a/external_tests/nss_bogo_shim/Makefile b/gtests/nss_bogo_shim/Makefile similarity index 100% rename from external_tests/nss_bogo_shim/Makefile rename to gtests/nss_bogo_shim/Makefile diff --git a/external_tests/nss_bogo_shim/config.cc b/gtests/nss_bogo_shim/config.cc similarity index 100% rename from external_tests/nss_bogo_shim/config.cc rename to gtests/nss_bogo_shim/config.cc diff --git a/external_tests/nss_bogo_shim/config.h b/gtests/nss_bogo_shim/config.h similarity index 100% rename from external_tests/nss_bogo_shim/config.h rename to gtests/nss_bogo_shim/config.h diff --git a/external_tests/nss_bogo_shim/config.json b/gtests/nss_bogo_shim/config.json similarity index 100% rename from external_tests/nss_bogo_shim/config.json rename to gtests/nss_bogo_shim/config.json diff --git a/external_tests/nss_bogo_shim/manifest.mn b/gtests/nss_bogo_shim/manifest.mn similarity index 100% rename from external_tests/nss_bogo_shim/manifest.mn rename to gtests/nss_bogo_shim/manifest.mn diff --git a/external_tests/nss_bogo_shim/nss_bogo_shim.cc b/gtests/nss_bogo_shim/nss_bogo_shim.cc similarity index 100% rename from external_tests/nss_bogo_shim/nss_bogo_shim.cc rename to gtests/nss_bogo_shim/nss_bogo_shim.cc diff --git a/external_tests/nss_bogo_shim/nss_bogo_shim.gyp b/gtests/nss_bogo_shim/nss_bogo_shim.gyp similarity index 97% rename from external_tests/nss_bogo_shim/nss_bogo_shim.gyp rename to gtests/nss_bogo_shim/nss_bogo_shim.gyp index c5f1ab34f3..f4f94e94b1 100644 --- a/external_tests/nss_bogo_shim/nss_bogo_shim.gyp +++ b/gtests/nss_bogo_shim/nss_bogo_shim.gyp @@ -18,7 +18,7 @@ '<(DEPTH)/exports.gyp:nss_exports', '<(DEPTH)/lib/util/util.gyp:nssutil3', '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3', - '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest', + '<(DEPTH)/gtests/google_test/google_test.gyp:gtest', '<(DEPTH)/lib/softoken/softoken.gyp:softokn', '<(DEPTH)/lib/smime/smime.gyp:smime', '<(DEPTH)/lib/ssl/ssl.gyp:ssl', diff --git a/external_tests/nss_bogo_shim/nsskeys.cc b/gtests/nss_bogo_shim/nsskeys.cc similarity index 100% rename from external_tests/nss_bogo_shim/nsskeys.cc rename to gtests/nss_bogo_shim/nsskeys.cc diff --git a/external_tests/nss_bogo_shim/nsskeys.h b/gtests/nss_bogo_shim/nsskeys.h similarity index 100% rename from external_tests/nss_bogo_shim/nsskeys.h rename to gtests/nss_bogo_shim/nsskeys.h diff --git a/external_tests/pk11_gtest/Makefile b/gtests/pk11_gtest/Makefile similarity index 100% rename from external_tests/pk11_gtest/Makefile rename to gtests/pk11_gtest/Makefile diff --git a/external_tests/pk11_gtest/manifest.mn b/gtests/pk11_gtest/manifest.mn similarity index 85% rename from external_tests/pk11_gtest/manifest.mn rename to gtests/pk11_gtest/manifest.mn index 514e4a7ddf..934d4cf337 100644 --- a/external_tests/pk11_gtest/manifest.mn +++ b/gtests/pk11_gtest/manifest.mn @@ -16,8 +16,8 @@ CPPSRCS = \ pk11_rsapss_unittest.cc \ $(NULL) -INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \ - -I$(CORE_DEPTH)/external_tests/common +INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \ + -I$(CORE_DEPTH)/gtests/common REQUIRES = nspr nss libdbm gtest diff --git a/external_tests/pk11_gtest/pk11_aeskeywrap_unittest.cc b/gtests/pk11_gtest/pk11_aeskeywrap_unittest.cc similarity index 100% rename from external_tests/pk11_gtest/pk11_aeskeywrap_unittest.cc rename to gtests/pk11_gtest/pk11_aeskeywrap_unittest.cc diff --git a/external_tests/pk11_gtest/pk11_chacha20poly1305_unittest.cc b/gtests/pk11_gtest/pk11_chacha20poly1305_unittest.cc similarity index 100% rename from external_tests/pk11_gtest/pk11_chacha20poly1305_unittest.cc rename to gtests/pk11_gtest/pk11_chacha20poly1305_unittest.cc diff --git a/external_tests/pk11_gtest/pk11_export_unittest.cc b/gtests/pk11_gtest/pk11_export_unittest.cc similarity index 100% rename from external_tests/pk11_gtest/pk11_export_unittest.cc rename to gtests/pk11_gtest/pk11_export_unittest.cc diff --git a/external_tests/pk11_gtest/pk11_gtest.gyp b/gtests/pk11_gtest/pk11_gtest.gyp similarity index 80% rename from external_tests/pk11_gtest/pk11_gtest.gyp rename to gtests/pk11_gtest/pk11_gtest.gyp index c08189c7e1..09bce728d7 100644 --- a/external_tests/pk11_gtest/pk11_gtest.gyp +++ b/gtests/pk11_gtest/pk11_gtest.gyp @@ -17,19 +17,19 @@ 'pk11_prf_unittest.cc', 'pk11_prng_unittest.cc', 'pk11_rsapss_unittest.cc', - '<(DEPTH)/external_tests/common/gtests.cc' + '<(DEPTH)/gtests/common/gtests.cc' ], 'dependencies': [ '<(DEPTH)/exports.gyp:nss_exports', '<(DEPTH)/lib/freebl/freebl.gyp:<(freebl_name)', - '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest', + '<(DEPTH)/gtests/google_test/google_test.gyp:gtest', ], } ], 'target_defaults': { 'include_dirs': [ - '../../external_tests/google_test/gtest/include', - '../../external_tests/common' + '../../gtests/google_test/gtest/include', + '../../gtests/common' ] }, 'variables': { diff --git a/external_tests/pk11_gtest/pk11_pbkdf2_unittest.cc b/gtests/pk11_gtest/pk11_pbkdf2_unittest.cc similarity index 100% rename from external_tests/pk11_gtest/pk11_pbkdf2_unittest.cc rename to gtests/pk11_gtest/pk11_pbkdf2_unittest.cc diff --git a/external_tests/pk11_gtest/pk11_prf_unittest.cc b/gtests/pk11_gtest/pk11_prf_unittest.cc similarity index 100% rename from external_tests/pk11_gtest/pk11_prf_unittest.cc rename to gtests/pk11_gtest/pk11_prf_unittest.cc diff --git a/external_tests/pk11_gtest/pk11_prng_unittest.cc b/gtests/pk11_gtest/pk11_prng_unittest.cc similarity index 100% rename from external_tests/pk11_gtest/pk11_prng_unittest.cc rename to gtests/pk11_gtest/pk11_prng_unittest.cc diff --git a/external_tests/pk11_gtest/pk11_rsapss_unittest.cc b/gtests/pk11_gtest/pk11_rsapss_unittest.cc similarity index 100% rename from external_tests/pk11_gtest/pk11_rsapss_unittest.cc rename to gtests/pk11_gtest/pk11_rsapss_unittest.cc diff --git a/external_tests/ssl_gtest/Makefile b/gtests/ssl_gtest/Makefile similarity index 100% rename from external_tests/ssl_gtest/Makefile rename to gtests/ssl_gtest/Makefile diff --git a/external_tests/ssl_gtest/databuffer.h b/gtests/ssl_gtest/databuffer.h similarity index 100% rename from external_tests/ssl_gtest/databuffer.h rename to gtests/ssl_gtest/databuffer.h diff --git a/external_tests/ssl_gtest/gtest_utils.h b/gtests/ssl_gtest/gtest_utils.h similarity index 100% rename from external_tests/ssl_gtest/gtest_utils.h rename to gtests/ssl_gtest/gtest_utils.h diff --git a/external_tests/ssl_gtest/libssl_internals.c b/gtests/ssl_gtest/libssl_internals.c similarity index 100% rename from external_tests/ssl_gtest/libssl_internals.c rename to gtests/ssl_gtest/libssl_internals.c diff --git a/external_tests/ssl_gtest/libssl_internals.h b/gtests/ssl_gtest/libssl_internals.h similarity index 100% rename from external_tests/ssl_gtest/libssl_internals.h rename to gtests/ssl_gtest/libssl_internals.h diff --git a/external_tests/ssl_gtest/manifest.mn b/gtests/ssl_gtest/manifest.mn similarity index 91% rename from external_tests/ssl_gtest/manifest.mn rename to gtests/ssl_gtest/manifest.mn index 540f518b02..4dc7358610 100644 --- a/external_tests/ssl_gtest/manifest.mn +++ b/gtests/ssl_gtest/manifest.mn @@ -40,8 +40,8 @@ CPPSRCS = \ tls_parser.cc \ $(NULL) -INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \ - -I$(CORE_DEPTH)/external_tests/common +INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \ + -I$(CORE_DEPTH)/gtests/common REQUIRES = nspr nss libdbm gtest diff --git a/external_tests/ssl_gtest/ssl_0rtt_unittest.cc b/gtests/ssl_gtest/ssl_0rtt_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_0rtt_unittest.cc rename to gtests/ssl_gtest/ssl_0rtt_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_agent_unittest.cc b/gtests/ssl_gtest/ssl_agent_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_agent_unittest.cc rename to gtests/ssl_gtest/ssl_agent_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_auth_unittest.cc b/gtests/ssl_gtest/ssl_auth_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_auth_unittest.cc rename to gtests/ssl_gtest/ssl_auth_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_cert_ext_unittest.cc b/gtests/ssl_gtest/ssl_cert_ext_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_cert_ext_unittest.cc rename to gtests/ssl_gtest/ssl_cert_ext_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_ciphersuite_unittest.cc b/gtests/ssl_gtest/ssl_ciphersuite_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_ciphersuite_unittest.cc rename to gtests/ssl_gtest/ssl_ciphersuite_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_damage_unittest.cc b/gtests/ssl_gtest/ssl_damage_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_damage_unittest.cc rename to gtests/ssl_gtest/ssl_damage_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_dhe_unittest.cc b/gtests/ssl_gtest/ssl_dhe_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_dhe_unittest.cc rename to gtests/ssl_gtest/ssl_dhe_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_drop_unittest.cc b/gtests/ssl_gtest/ssl_drop_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_drop_unittest.cc rename to gtests/ssl_gtest/ssl_drop_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_ecdh_unittest.cc b/gtests/ssl_gtest/ssl_ecdh_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_ecdh_unittest.cc rename to gtests/ssl_gtest/ssl_ecdh_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_ems_unittest.cc b/gtests/ssl_gtest/ssl_ems_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_ems_unittest.cc rename to gtests/ssl_gtest/ssl_ems_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_extension_unittest.cc b/gtests/ssl_gtest/ssl_extension_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_extension_unittest.cc rename to gtests/ssl_gtest/ssl_extension_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_gtest.cc b/gtests/ssl_gtest/ssl_gtest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_gtest.cc rename to gtests/ssl_gtest/ssl_gtest.cc diff --git a/external_tests/ssl_gtest/ssl_gtest.gyp b/gtests/ssl_gtest/ssl_gtest.gyp similarity index 95% rename from external_tests/ssl_gtest/ssl_gtest.gyp rename to gtests/ssl_gtest/ssl_gtest.gyp index 08242e077d..1c7e97ee5b 100644 --- a/external_tests/ssl_gtest/ssl_gtest.gyp +++ b/gtests/ssl_gtest/ssl_gtest.gyp @@ -43,7 +43,7 @@ '<(DEPTH)/exports.gyp:nss_exports', '<(DEPTH)/lib/util/util.gyp:nssutil3', '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3', - '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest', + '<(DEPTH)/gtests/google_test/google_test.gyp:gtest', '<(DEPTH)/lib/softoken/softoken.gyp:softokn', '<(DEPTH)/lib/smime/smime.gyp:smime', '<(DEPTH)/lib/ssl/ssl.gyp:ssl', @@ -91,8 +91,8 @@ ], 'target_defaults': { 'include_dirs': [ - '../../external_tests/google_test/gtest/include', - '../../external_tests/common', + '../../gtests/google_test/gtest/include', + '../../gtests/common', '../../lib/ssl' ], 'defines': [ diff --git a/external_tests/ssl_gtest/ssl_hrr_unittest.cc b/gtests/ssl_gtest/ssl_hrr_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_hrr_unittest.cc rename to gtests/ssl_gtest/ssl_hrr_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_loopback_unittest.cc b/gtests/ssl_gtest/ssl_loopback_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_loopback_unittest.cc rename to gtests/ssl_gtest/ssl_loopback_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_record_unittest.cc b/gtests/ssl_gtest/ssl_record_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_record_unittest.cc rename to gtests/ssl_gtest/ssl_record_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_resumption_unittest.cc b/gtests/ssl_gtest/ssl_resumption_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_resumption_unittest.cc rename to gtests/ssl_gtest/ssl_resumption_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_skip_unittest.cc b/gtests/ssl_gtest/ssl_skip_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_skip_unittest.cc rename to gtests/ssl_gtest/ssl_skip_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_staticrsa_unittest.cc b/gtests/ssl_gtest/ssl_staticrsa_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_staticrsa_unittest.cc rename to gtests/ssl_gtest/ssl_staticrsa_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_v2_client_hello_unittest.cc b/gtests/ssl_gtest/ssl_v2_client_hello_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_v2_client_hello_unittest.cc rename to gtests/ssl_gtest/ssl_v2_client_hello_unittest.cc diff --git a/external_tests/ssl_gtest/ssl_version_unittest.cc b/gtests/ssl_gtest/ssl_version_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/ssl_version_unittest.cc rename to gtests/ssl_gtest/ssl_version_unittest.cc diff --git a/external_tests/ssl_gtest/test_io.cc b/gtests/ssl_gtest/test_io.cc similarity index 100% rename from external_tests/ssl_gtest/test_io.cc rename to gtests/ssl_gtest/test_io.cc diff --git a/external_tests/ssl_gtest/test_io.h b/gtests/ssl_gtest/test_io.h similarity index 100% rename from external_tests/ssl_gtest/test_io.h rename to gtests/ssl_gtest/test_io.h diff --git a/external_tests/ssl_gtest/tls_agent.cc b/gtests/ssl_gtest/tls_agent.cc similarity index 100% rename from external_tests/ssl_gtest/tls_agent.cc rename to gtests/ssl_gtest/tls_agent.cc diff --git a/external_tests/ssl_gtest/tls_agent.h b/gtests/ssl_gtest/tls_agent.h similarity index 100% rename from external_tests/ssl_gtest/tls_agent.h rename to gtests/ssl_gtest/tls_agent.h diff --git a/external_tests/ssl_gtest/tls_connect.cc b/gtests/ssl_gtest/tls_connect.cc similarity index 100% rename from external_tests/ssl_gtest/tls_connect.cc rename to gtests/ssl_gtest/tls_connect.cc diff --git a/external_tests/ssl_gtest/tls_connect.h b/gtests/ssl_gtest/tls_connect.h similarity index 100% rename from external_tests/ssl_gtest/tls_connect.h rename to gtests/ssl_gtest/tls_connect.h diff --git a/external_tests/ssl_gtest/tls_filter.cc b/gtests/ssl_gtest/tls_filter.cc similarity index 100% rename from external_tests/ssl_gtest/tls_filter.cc rename to gtests/ssl_gtest/tls_filter.cc diff --git a/external_tests/ssl_gtest/tls_filter.h b/gtests/ssl_gtest/tls_filter.h similarity index 100% rename from external_tests/ssl_gtest/tls_filter.h rename to gtests/ssl_gtest/tls_filter.h diff --git a/external_tests/ssl_gtest/tls_hkdf_unittest.cc b/gtests/ssl_gtest/tls_hkdf_unittest.cc similarity index 100% rename from external_tests/ssl_gtest/tls_hkdf_unittest.cc rename to gtests/ssl_gtest/tls_hkdf_unittest.cc diff --git a/external_tests/ssl_gtest/tls_parser.cc b/gtests/ssl_gtest/tls_parser.cc similarity index 100% rename from external_tests/ssl_gtest/tls_parser.cc rename to gtests/ssl_gtest/tls_parser.cc diff --git a/external_tests/ssl_gtest/tls_parser.h b/gtests/ssl_gtest/tls_parser.h similarity index 100% rename from external_tests/ssl_gtest/tls_parser.h rename to gtests/ssl_gtest/tls_parser.h diff --git a/external_tests/util_gtest/Makefile b/gtests/util_gtest/Makefile similarity index 100% rename from external_tests/util_gtest/Makefile rename to gtests/util_gtest/Makefile diff --git a/external_tests/util_gtest/manifest.mn b/gtests/util_gtest/manifest.mn similarity index 84% rename from external_tests/util_gtest/manifest.mn rename to gtests/util_gtest/manifest.mn index 41e7edc0b5..fd4925142f 100644 --- a/external_tests/util_gtest/manifest.mn +++ b/gtests/util_gtest/manifest.mn @@ -11,8 +11,8 @@ CPPSRCS = \ $(NULL) INCLUDES += \ - -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \ - -I$(CORE_DEPTH)/external_tests/common \ + -I$(CORE_DEPTH)/gtests/google_test/gtest/include \ + -I$(CORE_DEPTH)/gtests/common \ $(NULL) REQUIRES = nspr gtest diff --git a/external_tests/util_gtest/util_gtest.gyp b/gtests/util_gtest/util_gtest.gyp similarity index 76% rename from external_tests/util_gtest/util_gtest.gyp rename to gtests/util_gtest/util_gtest.gyp index bd99b35da2..9ad5cc6f65 100644 --- a/external_tests/util_gtest/util_gtest.gyp +++ b/gtests/util_gtest/util_gtest.gyp @@ -12,19 +12,19 @@ 'type': 'executable', 'sources': [ 'util_utf8_unittest.cc', - '<(DEPTH)/external_tests/common/gtests.cc' + '<(DEPTH)/gtests/common/gtests.cc' ], 'dependencies': [ '<(DEPTH)/exports.gyp:nss_exports', - '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest', + '<(DEPTH)/gtests/google_test/google_test.gyp:gtest', '<(DEPTH)/lib/util/util.gyp:nssutil', ] } ], 'target_defaults': { 'include_dirs': [ - '../../external_tests/google_test/gtest/include', - '../../external_tests/common', + '../../gtests/google_test/gtest/include', + '../../gtests/common', '../../lib/util' ] }, diff --git a/external_tests/util_gtest/util_utf8_unittest.cc b/gtests/util_gtest/util_utf8_unittest.cc similarity index 100% rename from external_tests/util_gtest/util_utf8_unittest.cc rename to gtests/util_gtest/util_utf8_unittest.cc diff --git a/manifest.mn b/manifest.mn index 69fc19d6a7..92415cde97 100644 --- a/manifest.mn +++ b/manifest.mn @@ -10,7 +10,7 @@ IMPORTS = nspr20/v4.8 \ RELEASE = nss -DIRS = coreconf lib cmd external_tests +DIRS = coreconf lib cmd gtests ifdef FUZZ DIRS += fuzz diff --git a/nss.gyp b/nss.gyp index 0a683f6926..c9c5a3048f 100644 --- a/nss.gyp +++ b/nss.gyp @@ -207,13 +207,13 @@ 'cmd/tstclnt/tstclnt.gyp:tstclnt', 'cmd/vfychain/vfychain.gyp:vfychain', 'cmd/vfyserv/vfyserv.gyp:vfyserv', - 'external_tests/google_test/google_test.gyp:gtest1', - 'external_tests/common/common.gyp:gtests', - 'external_tests/der_gtest/der_gtest.gyp:der_gtest', - 'external_tests/pk11_gtest/pk11_gtest.gyp:pk11_gtest', - 'external_tests/ssl_gtest/ssl_gtest.gyp:ssl_gtest', - 'external_tests/util_gtest/util_gtest.gyp:util_gtest', - 'external_tests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim' + 'gtests/google_test/google_test.gyp:gtest1', + 'gtests/common/common.gyp:gtests', + 'gtests/der_gtest/der_gtest.gyp:der_gtest', + 'gtests/pk11_gtest/pk11_gtest.gyp:pk11_gtest', + 'gtests/ssl_gtest/ssl_gtest.gyp:ssl_gtest', + 'gtests/util_gtest/util_gtest.gyp:util_gtest', + 'gtests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim' ], 'conditions': [ [ 'OS=="linux"', { diff --git a/tests/bogo/bogo.sh b/tests/bogo/bogo.sh index c5c9a65284..05f10c8d0c 100755 --- a/tests/bogo/bogo.sh +++ b/tests/bogo/bogo.sh @@ -48,7 +48,7 @@ bogo_init (cd "$BORING"/ssl/test/runner; GOPATH="$PWD" go test -pipe -shim-path "${BINDIR}"/nss_bogo_shim \ -loose-errors -allow-unimplemented \ - -shim-config "${SOURCE_DIR}/external_tests/nss_bogo_shim/config.json") \ + -shim-config "${SOURCE_DIR}/gtests/nss_bogo_shim/config.json") \ 2>bogo.errors | tee bogo.log html_msg "${PIPESTATUS[0]}" 0 "Bogo" "Run successfully" grep -i 'FAILED\|Assertion failure' bogo.errors