diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 12629525..c6c38404 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -14,7 +14,6 @@ # this program. If not, see . set -e -set -x ###### ###### Build and output configuration @@ -398,8 +397,7 @@ compile () { -libraries "." \ -libraries "${ROOT}" \ -libraries "${BOARD_HARDWARE_PATH}/.." \ - -libraries "${BOARD_HARDWARE_PATH}/keyboardio/avr/libraries/Kaleidoscope/testing/googletest/googletest/include/gtest" \ - -libraries "${BOARD_HARDWARE_PATH}/keyboardio/avr/libraries/Kaleidoscope/testing/googletest/googletest/src" \ + -libraries "${BOARD_HARDWARE_PATH}/keyboardio/avr/libraries/Kaleidoscope/gtest-arduino" \ ${local_LIBS} \ ${EXTRA_BUILDER_ARGS} \ -build-cache "${CORE_CACHE_PATH}" \ diff --git a/testing/googletest/.clang-format b/googletest/.clang-format similarity index 100% rename from testing/googletest/.clang-format rename to googletest/.clang-format diff --git a/testing/googletest/.gitignore b/googletest/.gitignore similarity index 100% rename from testing/googletest/.gitignore rename to googletest/.gitignore diff --git a/testing/googletest/.travis.yml b/googletest/.travis.yml similarity index 100% rename from testing/googletest/.travis.yml rename to googletest/.travis.yml diff --git a/testing/googletest/BUILD.bazel b/googletest/BUILD.bazel similarity index 100% rename from testing/googletest/BUILD.bazel rename to googletest/BUILD.bazel diff --git a/testing/googletest/CMakeLists.txt b/googletest/CMakeLists.txt similarity index 100% rename from testing/googletest/CMakeLists.txt rename to googletest/CMakeLists.txt diff --git a/testing/googletest/CONTRIBUTING.md b/googletest/CONTRIBUTING.md similarity index 100% rename from testing/googletest/CONTRIBUTING.md rename to googletest/CONTRIBUTING.md diff --git a/testing/googletest/LICENSE b/googletest/LICENSE similarity index 100% rename from testing/googletest/LICENSE rename to googletest/LICENSE diff --git a/testing/googletest/README.md b/googletest/README.md similarity index 100% rename from testing/googletest/README.md rename to googletest/README.md diff --git a/testing/googletest/WORKSPACE b/googletest/WORKSPACE similarity index 100% rename from testing/googletest/WORKSPACE rename to googletest/WORKSPACE diff --git a/testing/googletest/appveyor.yml b/googletest/appveyor.yml similarity index 100% rename from testing/googletest/appveyor.yml rename to googletest/appveyor.yml diff --git a/testing/googletest/ci/build-linux-bazel.sh b/googletest/ci/build-linux-bazel.sh similarity index 100% rename from testing/googletest/ci/build-linux-bazel.sh rename to googletest/ci/build-linux-bazel.sh diff --git a/testing/googletest/ci/build-platformio.sh b/googletest/ci/build-platformio.sh similarity index 100% rename from testing/googletest/ci/build-platformio.sh rename to googletest/ci/build-platformio.sh diff --git a/testing/googletest/ci/env-linux.sh b/googletest/ci/env-linux.sh similarity index 100% rename from testing/googletest/ci/env-linux.sh rename to googletest/ci/env-linux.sh diff --git a/testing/googletest/ci/env-osx.sh b/googletest/ci/env-osx.sh similarity index 100% rename from testing/googletest/ci/env-osx.sh rename to googletest/ci/env-osx.sh diff --git a/testing/googletest/ci/get-nprocessors.sh b/googletest/ci/get-nprocessors.sh similarity index 100% rename from testing/googletest/ci/get-nprocessors.sh rename to googletest/ci/get-nprocessors.sh diff --git a/testing/googletest/ci/install-linux.sh b/googletest/ci/install-linux.sh similarity index 100% rename from testing/googletest/ci/install-linux.sh rename to googletest/ci/install-linux.sh diff --git a/testing/googletest/ci/install-osx.sh b/googletest/ci/install-osx.sh similarity index 100% rename from testing/googletest/ci/install-osx.sh rename to googletest/ci/install-osx.sh diff --git a/testing/googletest/ci/install-platformio.sh b/googletest/ci/install-platformio.sh similarity index 100% rename from testing/googletest/ci/install-platformio.sh rename to googletest/ci/install-platformio.sh diff --git a/testing/googletest/ci/log-config.sh b/googletest/ci/log-config.sh similarity index 100% rename from testing/googletest/ci/log-config.sh rename to googletest/ci/log-config.sh diff --git a/testing/googletest/ci/travis.sh b/googletest/ci/travis.sh similarity index 100% rename from testing/googletest/ci/travis.sh rename to googletest/ci/travis.sh diff --git a/testing/googletest/googlemock/CMakeLists.txt b/googletest/googlemock/CMakeLists.txt similarity index 100% rename from testing/googletest/googlemock/CMakeLists.txt rename to googletest/googlemock/CMakeLists.txt diff --git a/testing/googletest/googlemock/CONTRIBUTORS b/googletest/googlemock/CONTRIBUTORS similarity index 100% rename from testing/googletest/googlemock/CONTRIBUTORS rename to googletest/googlemock/CONTRIBUTORS diff --git a/testing/googletest/googlemock/LICENSE b/googletest/googlemock/LICENSE similarity index 100% rename from testing/googletest/googlemock/LICENSE rename to googletest/googlemock/LICENSE diff --git a/testing/googletest/googlemock/README.md b/googletest/googlemock/README.md similarity index 100% rename from testing/googletest/googlemock/README.md rename to googletest/googlemock/README.md diff --git a/testing/googletest/googlemock/cmake/gmock.pc.in b/googletest/googlemock/cmake/gmock.pc.in similarity index 100% rename from testing/googletest/googlemock/cmake/gmock.pc.in rename to googletest/googlemock/cmake/gmock.pc.in diff --git a/testing/googletest/googlemock/cmake/gmock_main.pc.in b/googletest/googlemock/cmake/gmock_main.pc.in similarity index 100% rename from testing/googletest/googlemock/cmake/gmock_main.pc.in rename to googletest/googlemock/cmake/gmock_main.pc.in diff --git a/testing/googletest/googlemock/docs/cheat_sheet.md b/googletest/googlemock/docs/cheat_sheet.md similarity index 100% rename from testing/googletest/googlemock/docs/cheat_sheet.md rename to googletest/googlemock/docs/cheat_sheet.md diff --git a/testing/googletest/googlemock/docs/cook_book.md b/googletest/googlemock/docs/cook_book.md similarity index 100% rename from testing/googletest/googlemock/docs/cook_book.md rename to googletest/googlemock/docs/cook_book.md diff --git a/testing/googletest/googlemock/docs/for_dummies.md b/googletest/googlemock/docs/for_dummies.md similarity index 100% rename from testing/googletest/googlemock/docs/for_dummies.md rename to googletest/googlemock/docs/for_dummies.md diff --git a/testing/googletest/googlemock/docs/gmock_faq.md b/googletest/googlemock/docs/gmock_faq.md similarity index 100% rename from testing/googletest/googlemock/docs/gmock_faq.md rename to googletest/googlemock/docs/gmock_faq.md diff --git a/testing/googletest/googlemock/include/gmock/gmock-actions.h b/googletest/googlemock/include/gmock/gmock-actions.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-actions.h rename to googletest/googlemock/include/gmock/gmock-actions.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-cardinalities.h b/googletest/googlemock/include/gmock/gmock-cardinalities.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-cardinalities.h rename to googletest/googlemock/include/gmock/gmock-cardinalities.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-function-mocker.h b/googletest/googlemock/include/gmock/gmock-function-mocker.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-function-mocker.h rename to googletest/googlemock/include/gmock/gmock-function-mocker.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-generated-actions.h b/googletest/googlemock/include/gmock/gmock-generated-actions.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-generated-actions.h rename to googletest/googlemock/include/gmock/gmock-generated-actions.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump b/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump rename to googletest/googlemock/include/gmock/gmock-generated-actions.h.pump diff --git a/testing/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h b/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h rename to googletest/googlemock/include/gmock/gmock-generated-function-mockers.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump rename to googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump diff --git a/testing/googletest/googlemock/include/gmock/gmock-generated-matchers.h b/googletest/googlemock/include/gmock/gmock-generated-matchers.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-generated-matchers.h rename to googletest/googlemock/include/gmock/gmock-generated-matchers.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump b/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump rename to googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump diff --git a/testing/googletest/googlemock/include/gmock/gmock-matchers.h b/googletest/googlemock/include/gmock/gmock-matchers.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-matchers.h rename to googletest/googlemock/include/gmock/gmock-matchers.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-more-actions.h b/googletest/googlemock/include/gmock/gmock-more-actions.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-more-actions.h rename to googletest/googlemock/include/gmock/gmock-more-actions.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-more-matchers.h b/googletest/googlemock/include/gmock/gmock-more-matchers.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-more-matchers.h rename to googletest/googlemock/include/gmock/gmock-more-matchers.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-nice-strict.h b/googletest/googlemock/include/gmock/gmock-nice-strict.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-nice-strict.h rename to googletest/googlemock/include/gmock/gmock-nice-strict.h diff --git a/testing/googletest/googlemock/include/gmock/gmock-spec-builders.h b/googletest/googlemock/include/gmock/gmock-spec-builders.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock-spec-builders.h rename to googletest/googlemock/include/gmock/gmock-spec-builders.h diff --git a/testing/googletest/googlemock/include/gmock/gmock.h b/googletest/googlemock/include/gmock/gmock.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/gmock.h rename to googletest/googlemock/include/gmock/gmock.h diff --git a/testing/googletest/googlemock/include/gmock/internal/custom/README.md b/googletest/googlemock/include/gmock/internal/custom/README.md similarity index 100% rename from testing/googletest/googlemock/include/gmock/internal/custom/README.md rename to googletest/googlemock/include/gmock/internal/custom/README.md diff --git a/testing/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h rename to googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h diff --git a/testing/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump similarity index 100% rename from testing/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump rename to googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump diff --git a/testing/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h rename to googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h diff --git a/testing/googletest/googlemock/include/gmock/internal/custom/gmock-port.h b/googletest/googlemock/include/gmock/internal/custom/gmock-port.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/internal/custom/gmock-port.h rename to googletest/googlemock/include/gmock/internal/custom/gmock-port.h diff --git a/testing/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h b/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h rename to googletest/googlemock/include/gmock/internal/gmock-internal-utils.h diff --git a/testing/googletest/googlemock/include/gmock/internal/gmock-port.h b/googletest/googlemock/include/gmock/internal/gmock-port.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/internal/gmock-port.h rename to googletest/googlemock/include/gmock/internal/gmock-port.h diff --git a/testing/googletest/googlemock/include/gmock/internal/gmock-pp.h b/googletest/googlemock/include/gmock/internal/gmock-pp.h similarity index 100% rename from testing/googletest/googlemock/include/gmock/internal/gmock-pp.h rename to googletest/googlemock/include/gmock/internal/gmock-pp.h diff --git a/testing/googletest/googlemock/scripts/fuse_gmock_files.py b/googletest/googlemock/scripts/fuse_gmock_files.py similarity index 100% rename from testing/googletest/googlemock/scripts/fuse_gmock_files.py rename to googletest/googlemock/scripts/fuse_gmock_files.py diff --git a/testing/googletest/googlemock/scripts/generator/LICENSE b/googletest/googlemock/scripts/generator/LICENSE similarity index 100% rename from testing/googletest/googlemock/scripts/generator/LICENSE rename to googletest/googlemock/scripts/generator/LICENSE diff --git a/testing/googletest/googlemock/scripts/generator/README b/googletest/googlemock/scripts/generator/README similarity index 100% rename from testing/googletest/googlemock/scripts/generator/README rename to googletest/googlemock/scripts/generator/README diff --git a/testing/googletest/googlemock/scripts/generator/README.cppclean b/googletest/googlemock/scripts/generator/README.cppclean similarity index 100% rename from testing/googletest/googlemock/scripts/generator/README.cppclean rename to googletest/googlemock/scripts/generator/README.cppclean diff --git a/testing/googletest/googlemock/scripts/generator/cpp/__init__.py b/googletest/googlemock/scripts/generator/cpp/__init__.py similarity index 100% rename from testing/googletest/googlemock/scripts/generator/cpp/__init__.py rename to googletest/googlemock/scripts/generator/cpp/__init__.py diff --git a/testing/googletest/googlemock/scripts/generator/cpp/ast.py b/googletest/googlemock/scripts/generator/cpp/ast.py similarity index 100% rename from testing/googletest/googlemock/scripts/generator/cpp/ast.py rename to googletest/googlemock/scripts/generator/cpp/ast.py diff --git a/testing/googletest/googlemock/scripts/generator/cpp/gmock_class.py b/googletest/googlemock/scripts/generator/cpp/gmock_class.py similarity index 100% rename from testing/googletest/googlemock/scripts/generator/cpp/gmock_class.py rename to googletest/googlemock/scripts/generator/cpp/gmock_class.py diff --git a/testing/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py b/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py similarity index 100% rename from testing/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py rename to googletest/googlemock/scripts/generator/cpp/gmock_class_test.py diff --git a/testing/googletest/googlemock/scripts/generator/cpp/keywords.py b/googletest/googlemock/scripts/generator/cpp/keywords.py similarity index 100% rename from testing/googletest/googlemock/scripts/generator/cpp/keywords.py rename to googletest/googlemock/scripts/generator/cpp/keywords.py diff --git a/testing/googletest/googlemock/scripts/generator/cpp/tokenize.py b/googletest/googlemock/scripts/generator/cpp/tokenize.py similarity index 100% rename from testing/googletest/googlemock/scripts/generator/cpp/tokenize.py rename to googletest/googlemock/scripts/generator/cpp/tokenize.py diff --git a/testing/googletest/googlemock/scripts/generator/cpp/utils.py b/googletest/googlemock/scripts/generator/cpp/utils.py similarity index 100% rename from testing/googletest/googlemock/scripts/generator/cpp/utils.py rename to googletest/googlemock/scripts/generator/cpp/utils.py diff --git a/testing/googletest/googlemock/scripts/generator/gmock_gen.py b/googletest/googlemock/scripts/generator/gmock_gen.py similarity index 100% rename from testing/googletest/googlemock/scripts/generator/gmock_gen.py rename to googletest/googlemock/scripts/generator/gmock_gen.py diff --git a/testing/googletest/googlemock/scripts/gmock-config.in b/googletest/googlemock/scripts/gmock-config.in similarity index 100% rename from testing/googletest/googlemock/scripts/gmock-config.in rename to googletest/googlemock/scripts/gmock-config.in diff --git a/testing/googletest/googlemock/scripts/gmock_doctor.py b/googletest/googlemock/scripts/gmock_doctor.py similarity index 100% rename from testing/googletest/googlemock/scripts/gmock_doctor.py rename to googletest/googlemock/scripts/gmock_doctor.py diff --git a/testing/googletest/googlemock/scripts/upload.py b/googletest/googlemock/scripts/upload.py similarity index 100% rename from testing/googletest/googlemock/scripts/upload.py rename to googletest/googlemock/scripts/upload.py diff --git a/testing/googletest/googlemock/scripts/upload_gmock.py b/googletest/googlemock/scripts/upload_gmock.py similarity index 100% rename from testing/googletest/googlemock/scripts/upload_gmock.py rename to googletest/googlemock/scripts/upload_gmock.py diff --git a/testing/googletest/googlemock/src/gmock-all.cc b/googletest/googlemock/src/gmock-all.cc similarity index 100% rename from testing/googletest/googlemock/src/gmock-all.cc rename to googletest/googlemock/src/gmock-all.cc diff --git a/testing/googletest/googlemock/src/gmock-cardinalities.cc b/googletest/googlemock/src/gmock-cardinalities.cc similarity index 100% rename from testing/googletest/googlemock/src/gmock-cardinalities.cc rename to googletest/googlemock/src/gmock-cardinalities.cc diff --git a/testing/googletest/googlemock/src/gmock-internal-utils.cc b/googletest/googlemock/src/gmock-internal-utils.cc similarity index 100% rename from testing/googletest/googlemock/src/gmock-internal-utils.cc rename to googletest/googlemock/src/gmock-internal-utils.cc diff --git a/testing/googletest/googlemock/src/gmock-matchers.cc b/googletest/googlemock/src/gmock-matchers.cc similarity index 100% rename from testing/googletest/googlemock/src/gmock-matchers.cc rename to googletest/googlemock/src/gmock-matchers.cc diff --git a/testing/googletest/googlemock/src/gmock-spec-builders.cc b/googletest/googlemock/src/gmock-spec-builders.cc similarity index 100% rename from testing/googletest/googlemock/src/gmock-spec-builders.cc rename to googletest/googlemock/src/gmock-spec-builders.cc diff --git a/testing/googletest/googlemock/src/gmock.cc b/googletest/googlemock/src/gmock.cc similarity index 100% rename from testing/googletest/googlemock/src/gmock.cc rename to googletest/googlemock/src/gmock.cc diff --git a/testing/googletest/googlemock/src/gmock_main.cc b/googletest/googlemock/src/gmock_main.cc similarity index 100% rename from testing/googletest/googlemock/src/gmock_main.cc rename to googletest/googlemock/src/gmock_main.cc diff --git a/testing/googletest/googlemock/test/BUILD.bazel b/googletest/googlemock/test/BUILD.bazel similarity index 100% rename from testing/googletest/googlemock/test/BUILD.bazel rename to googletest/googlemock/test/BUILD.bazel diff --git a/testing/googletest/googlemock/test/gmock-actions_test.cc b/googletest/googlemock/test/gmock-actions_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-actions_test.cc rename to googletest/googlemock/test/gmock-actions_test.cc diff --git a/testing/googletest/googlemock/test/gmock-cardinalities_test.cc b/googletest/googlemock/test/gmock-cardinalities_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-cardinalities_test.cc rename to googletest/googlemock/test/gmock-cardinalities_test.cc diff --git a/testing/googletest/googlemock/test/gmock-function-mocker_nc.cc b/googletest/googlemock/test/gmock-function-mocker_nc.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-function-mocker_nc.cc rename to googletest/googlemock/test/gmock-function-mocker_nc.cc diff --git a/testing/googletest/googlemock/test/gmock-function-mocker_nc_test.py b/googletest/googlemock/test/gmock-function-mocker_nc_test.py similarity index 100% rename from testing/googletest/googlemock/test/gmock-function-mocker_nc_test.py rename to googletest/googlemock/test/gmock-function-mocker_nc_test.py diff --git a/testing/googletest/googlemock/test/gmock-function-mocker_test.cc b/googletest/googlemock/test/gmock-function-mocker_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-function-mocker_test.cc rename to googletest/googlemock/test/gmock-function-mocker_test.cc diff --git a/testing/googletest/googlemock/test/gmock-generated-actions_test.cc b/googletest/googlemock/test/gmock-generated-actions_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-generated-actions_test.cc rename to googletest/googlemock/test/gmock-generated-actions_test.cc diff --git a/testing/googletest/googlemock/test/gmock-generated-function-mockers_test.cc b/googletest/googlemock/test/gmock-generated-function-mockers_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-generated-function-mockers_test.cc rename to googletest/googlemock/test/gmock-generated-function-mockers_test.cc diff --git a/testing/googletest/googlemock/test/gmock-generated-matchers_test.cc b/googletest/googlemock/test/gmock-generated-matchers_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-generated-matchers_test.cc rename to googletest/googlemock/test/gmock-generated-matchers_test.cc diff --git a/testing/googletest/googlemock/test/gmock-internal-utils_test.cc b/googletest/googlemock/test/gmock-internal-utils_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-internal-utils_test.cc rename to googletest/googlemock/test/gmock-internal-utils_test.cc diff --git a/testing/googletest/googlemock/test/gmock-matchers_test.cc b/googletest/googlemock/test/gmock-matchers_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-matchers_test.cc rename to googletest/googlemock/test/gmock-matchers_test.cc diff --git a/testing/googletest/googlemock/test/gmock-more-actions_test.cc b/googletest/googlemock/test/gmock-more-actions_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-more-actions_test.cc rename to googletest/googlemock/test/gmock-more-actions_test.cc diff --git a/testing/googletest/googlemock/test/gmock-nice-strict_test.cc b/googletest/googlemock/test/gmock-nice-strict_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-nice-strict_test.cc rename to googletest/googlemock/test/gmock-nice-strict_test.cc diff --git a/testing/googletest/googlemock/test/gmock-port_test.cc b/googletest/googlemock/test/gmock-port_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-port_test.cc rename to googletest/googlemock/test/gmock-port_test.cc diff --git a/testing/googletest/googlemock/test/gmock-pp-string_test.cc b/googletest/googlemock/test/gmock-pp-string_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-pp-string_test.cc rename to googletest/googlemock/test/gmock-pp-string_test.cc diff --git a/testing/googletest/googlemock/test/gmock-pp_test.cc b/googletest/googlemock/test/gmock-pp_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-pp_test.cc rename to googletest/googlemock/test/gmock-pp_test.cc diff --git a/testing/googletest/googlemock/test/gmock-spec-builders_test.cc b/googletest/googlemock/test/gmock-spec-builders_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock-spec-builders_test.cc rename to googletest/googlemock/test/gmock-spec-builders_test.cc diff --git a/testing/googletest/googlemock/test/gmock_all_test.cc b/googletest/googlemock/test/gmock_all_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock_all_test.cc rename to googletest/googlemock/test/gmock_all_test.cc diff --git a/testing/googletest/googlemock/test/gmock_ex_test.cc b/googletest/googlemock/test/gmock_ex_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock_ex_test.cc rename to googletest/googlemock/test/gmock_ex_test.cc diff --git a/testing/googletest/googlemock/test/gmock_leak_test.py b/googletest/googlemock/test/gmock_leak_test.py similarity index 100% rename from testing/googletest/googlemock/test/gmock_leak_test.py rename to googletest/googlemock/test/gmock_leak_test.py diff --git a/testing/googletest/googlemock/test/gmock_leak_test_.cc b/googletest/googlemock/test/gmock_leak_test_.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock_leak_test_.cc rename to googletest/googlemock/test/gmock_leak_test_.cc diff --git a/testing/googletest/googlemock/test/gmock_link2_test.cc b/googletest/googlemock/test/gmock_link2_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock_link2_test.cc rename to googletest/googlemock/test/gmock_link2_test.cc diff --git a/testing/googletest/googlemock/test/gmock_link_test.cc b/googletest/googlemock/test/gmock_link_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock_link_test.cc rename to googletest/googlemock/test/gmock_link_test.cc diff --git a/testing/googletest/googlemock/test/gmock_link_test.h b/googletest/googlemock/test/gmock_link_test.h similarity index 100% rename from testing/googletest/googlemock/test/gmock_link_test.h rename to googletest/googlemock/test/gmock_link_test.h diff --git a/testing/googletest/googlemock/test/gmock_output_test.py b/googletest/googlemock/test/gmock_output_test.py similarity index 100% rename from testing/googletest/googlemock/test/gmock_output_test.py rename to googletest/googlemock/test/gmock_output_test.py diff --git a/testing/googletest/googlemock/test/gmock_output_test_.cc b/googletest/googlemock/test/gmock_output_test_.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock_output_test_.cc rename to googletest/googlemock/test/gmock_output_test_.cc diff --git a/testing/googletest/googlemock/test/gmock_output_test_golden.txt b/googletest/googlemock/test/gmock_output_test_golden.txt similarity index 100% rename from testing/googletest/googlemock/test/gmock_output_test_golden.txt rename to googletest/googlemock/test/gmock_output_test_golden.txt diff --git a/testing/googletest/googlemock/test/gmock_stress_test.cc b/googletest/googlemock/test/gmock_stress_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock_stress_test.cc rename to googletest/googlemock/test/gmock_stress_test.cc diff --git a/testing/googletest/googlemock/test/gmock_test.cc b/googletest/googlemock/test/gmock_test.cc similarity index 100% rename from testing/googletest/googlemock/test/gmock_test.cc rename to googletest/googlemock/test/gmock_test.cc diff --git a/testing/googletest/googlemock/test/gmock_test_utils.py b/googletest/googlemock/test/gmock_test_utils.py similarity index 100% rename from testing/googletest/googlemock/test/gmock_test_utils.py rename to googletest/googlemock/test/gmock_test_utils.py diff --git a/testing/googletest/googletest/CMakeLists.txt b/googletest/googletest/CMakeLists.txt similarity index 100% rename from testing/googletest/googletest/CMakeLists.txt rename to googletest/googletest/CMakeLists.txt diff --git a/testing/googletest/googletest/CONTRIBUTORS b/googletest/googletest/CONTRIBUTORS similarity index 100% rename from testing/googletest/googletest/CONTRIBUTORS rename to googletest/googletest/CONTRIBUTORS diff --git a/testing/googletest/googletest/LICENSE b/googletest/googletest/LICENSE similarity index 100% rename from testing/googletest/googletest/LICENSE rename to googletest/googletest/LICENSE diff --git a/testing/googletest/googletest/README.md b/googletest/googletest/README.md similarity index 100% rename from testing/googletest/googletest/README.md rename to googletest/googletest/README.md diff --git a/testing/googletest/googletest/cmake/Config.cmake.in b/googletest/googletest/cmake/Config.cmake.in similarity index 100% rename from testing/googletest/googletest/cmake/Config.cmake.in rename to googletest/googletest/cmake/Config.cmake.in diff --git a/testing/googletest/googletest/cmake/gtest.pc.in b/googletest/googletest/cmake/gtest.pc.in similarity index 100% rename from testing/googletest/googletest/cmake/gtest.pc.in rename to googletest/googletest/cmake/gtest.pc.in diff --git a/testing/googletest/googletest/cmake/gtest_main.pc.in b/googletest/googletest/cmake/gtest_main.pc.in similarity index 100% rename from testing/googletest/googletest/cmake/gtest_main.pc.in rename to googletest/googletest/cmake/gtest_main.pc.in diff --git a/testing/googletest/googletest/cmake/internal_utils.cmake b/googletest/googletest/cmake/internal_utils.cmake similarity index 100% rename from testing/googletest/googletest/cmake/internal_utils.cmake rename to googletest/googletest/cmake/internal_utils.cmake diff --git a/testing/googletest/googletest/cmake/libgtest.la.in b/googletest/googletest/cmake/libgtest.la.in similarity index 100% rename from testing/googletest/googletest/cmake/libgtest.la.in rename to googletest/googletest/cmake/libgtest.la.in diff --git a/testing/googletest/googletest/docs/advanced.md b/googletest/googletest/docs/advanced.md similarity index 100% rename from testing/googletest/googletest/docs/advanced.md rename to googletest/googletest/docs/advanced.md diff --git a/testing/googletest/googletest/docs/faq.md b/googletest/googletest/docs/faq.md similarity index 100% rename from testing/googletest/googletest/docs/faq.md rename to googletest/googletest/docs/faq.md diff --git a/testing/googletest/googletest/docs/pkgconfig.md b/googletest/googletest/docs/pkgconfig.md similarity index 100% rename from testing/googletest/googletest/docs/pkgconfig.md rename to googletest/googletest/docs/pkgconfig.md diff --git a/testing/googletest/googletest/docs/primer.md b/googletest/googletest/docs/primer.md similarity index 100% rename from testing/googletest/googletest/docs/primer.md rename to googletest/googletest/docs/primer.md diff --git a/testing/googletest/googletest/docs/pump_manual.md b/googletest/googletest/docs/pump_manual.md similarity index 100% rename from testing/googletest/googletest/docs/pump_manual.md rename to googletest/googletest/docs/pump_manual.md diff --git a/testing/googletest/googletest/docs/samples.md b/googletest/googletest/docs/samples.md similarity index 100% rename from testing/googletest/googletest/docs/samples.md rename to googletest/googletest/docs/samples.md diff --git a/testing/googletest/googletest/include/gtest/gtest-death-test.h b/googletest/googletest/include/gtest/gtest-death-test.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest-death-test.h rename to googletest/googletest/include/gtest/gtest-death-test.h diff --git a/testing/googletest/googletest/include/gtest/gtest-matchers.h b/googletest/googletest/include/gtest/gtest-matchers.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest-matchers.h rename to googletest/googletest/include/gtest/gtest-matchers.h diff --git a/testing/googletest/googletest/include/gtest/gtest-message.h b/googletest/googletest/include/gtest/gtest-message.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest-message.h rename to googletest/googletest/include/gtest/gtest-message.h diff --git a/testing/googletest/googletest/include/gtest/gtest-param-test.h b/googletest/googletest/include/gtest/gtest-param-test.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest-param-test.h rename to googletest/googletest/include/gtest/gtest-param-test.h diff --git a/testing/googletest/googletest/include/gtest/gtest-printers.h b/googletest/googletest/include/gtest/gtest-printers.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest-printers.h rename to googletest/googletest/include/gtest/gtest-printers.h diff --git a/testing/googletest/googletest/include/gtest/gtest-spi.h b/googletest/googletest/include/gtest/gtest-spi.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest-spi.h rename to googletest/googletest/include/gtest/gtest-spi.h diff --git a/testing/googletest/googletest/include/gtest/gtest-test-part.h b/googletest/googletest/include/gtest/gtest-test-part.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest-test-part.h rename to googletest/googletest/include/gtest/gtest-test-part.h diff --git a/testing/googletest/googletest/include/gtest/gtest-typed-test.h b/googletest/googletest/include/gtest/gtest-typed-test.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest-typed-test.h rename to googletest/googletest/include/gtest/gtest-typed-test.h diff --git a/testing/googletest/googletest/include/gtest/gtest.h b/googletest/googletest/include/gtest/gtest.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest.h rename to googletest/googletest/include/gtest/gtest.h diff --git a/testing/googletest/googletest/include/gtest/gtest_pred_impl.h b/googletest/googletest/include/gtest/gtest_pred_impl.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest_pred_impl.h rename to googletest/googletest/include/gtest/gtest_pred_impl.h diff --git a/testing/googletest/googletest/include/gtest/gtest_prod.h b/googletest/googletest/include/gtest/gtest_prod.h similarity index 100% rename from testing/googletest/googletest/include/gtest/gtest_prod.h rename to googletest/googletest/include/gtest/gtest_prod.h diff --git a/testing/googletest/googletest/include/gtest/internal/custom/README.md b/googletest/googletest/include/gtest/internal/custom/README.md similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/custom/README.md rename to googletest/googletest/include/gtest/internal/custom/README.md diff --git a/testing/googletest/googletest/include/gtest/internal/custom/gtest-port.h b/googletest/googletest/include/gtest/internal/custom/gtest-port.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/custom/gtest-port.h rename to googletest/googletest/include/gtest/internal/custom/gtest-port.h diff --git a/testing/googletest/googletest/include/gtest/internal/custom/gtest-printers.h b/googletest/googletest/include/gtest/internal/custom/gtest-printers.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/custom/gtest-printers.h rename to googletest/googletest/include/gtest/internal/custom/gtest-printers.h diff --git a/testing/googletest/googletest/include/gtest/internal/custom/gtest.h b/googletest/googletest/include/gtest/internal/custom/gtest.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/custom/gtest.h rename to googletest/googletest/include/gtest/internal/custom/gtest.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h b/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h rename to googletest/googletest/include/gtest/internal/gtest-death-test-internal.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-filepath.h b/googletest/googletest/include/gtest/internal/gtest-filepath.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-filepath.h rename to googletest/googletest/include/gtest/internal/gtest-filepath.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-internal.h b/googletest/googletest/include/gtest/internal/gtest-internal.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-internal.h rename to googletest/googletest/include/gtest/internal/gtest-internal.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-param-util.h b/googletest/googletest/include/gtest/internal/gtest-param-util.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-param-util.h rename to googletest/googletest/include/gtest/internal/gtest-param-util.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/googletest/include/gtest/internal/gtest-port-arch.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-port-arch.h rename to googletest/googletest/include/gtest/internal/gtest-port-arch.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-port.h b/googletest/googletest/include/gtest/internal/gtest-port.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-port.h rename to googletest/googletest/include/gtest/internal/gtest-port.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-string.h b/googletest/googletest/include/gtest/internal/gtest-string.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-string.h rename to googletest/googletest/include/gtest/internal/gtest-string.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-type-util.h b/googletest/googletest/include/gtest/internal/gtest-type-util.h similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-type-util.h rename to googletest/googletest/include/gtest/internal/gtest-type-util.h diff --git a/testing/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump b/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump similarity index 100% rename from testing/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump rename to googletest/googletest/include/gtest/internal/gtest-type-util.h.pump diff --git a/testing/googletest/googletest/samples/prime_tables.h b/googletest/googletest/samples/prime_tables.h similarity index 100% rename from testing/googletest/googletest/samples/prime_tables.h rename to googletest/googletest/samples/prime_tables.h diff --git a/testing/googletest/googletest/samples/sample1.cc b/googletest/googletest/samples/sample1.cc similarity index 100% rename from testing/googletest/googletest/samples/sample1.cc rename to googletest/googletest/samples/sample1.cc diff --git a/testing/googletest/googletest/samples/sample1.h b/googletest/googletest/samples/sample1.h similarity index 100% rename from testing/googletest/googletest/samples/sample1.h rename to googletest/googletest/samples/sample1.h diff --git a/testing/googletest/googletest/samples/sample10_unittest.cc b/googletest/googletest/samples/sample10_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample10_unittest.cc rename to googletest/googletest/samples/sample10_unittest.cc diff --git a/testing/googletest/googletest/samples/sample1_unittest.cc b/googletest/googletest/samples/sample1_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample1_unittest.cc rename to googletest/googletest/samples/sample1_unittest.cc diff --git a/testing/googletest/googletest/samples/sample2.cc b/googletest/googletest/samples/sample2.cc similarity index 100% rename from testing/googletest/googletest/samples/sample2.cc rename to googletest/googletest/samples/sample2.cc diff --git a/testing/googletest/googletest/samples/sample2.h b/googletest/googletest/samples/sample2.h similarity index 100% rename from testing/googletest/googletest/samples/sample2.h rename to googletest/googletest/samples/sample2.h diff --git a/testing/googletest/googletest/samples/sample2_unittest.cc b/googletest/googletest/samples/sample2_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample2_unittest.cc rename to googletest/googletest/samples/sample2_unittest.cc diff --git a/testing/googletest/googletest/samples/sample3-inl.h b/googletest/googletest/samples/sample3-inl.h similarity index 100% rename from testing/googletest/googletest/samples/sample3-inl.h rename to googletest/googletest/samples/sample3-inl.h diff --git a/testing/googletest/googletest/samples/sample3_unittest.cc b/googletest/googletest/samples/sample3_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample3_unittest.cc rename to googletest/googletest/samples/sample3_unittest.cc diff --git a/testing/googletest/googletest/samples/sample4.cc b/googletest/googletest/samples/sample4.cc similarity index 100% rename from testing/googletest/googletest/samples/sample4.cc rename to googletest/googletest/samples/sample4.cc diff --git a/testing/googletest/googletest/samples/sample4.h b/googletest/googletest/samples/sample4.h similarity index 100% rename from testing/googletest/googletest/samples/sample4.h rename to googletest/googletest/samples/sample4.h diff --git a/testing/googletest/googletest/samples/sample4_unittest.cc b/googletest/googletest/samples/sample4_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample4_unittest.cc rename to googletest/googletest/samples/sample4_unittest.cc diff --git a/testing/googletest/googletest/samples/sample5_unittest.cc b/googletest/googletest/samples/sample5_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample5_unittest.cc rename to googletest/googletest/samples/sample5_unittest.cc diff --git a/testing/googletest/googletest/samples/sample6_unittest.cc b/googletest/googletest/samples/sample6_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample6_unittest.cc rename to googletest/googletest/samples/sample6_unittest.cc diff --git a/testing/googletest/googletest/samples/sample7_unittest.cc b/googletest/googletest/samples/sample7_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample7_unittest.cc rename to googletest/googletest/samples/sample7_unittest.cc diff --git a/testing/googletest/googletest/samples/sample8_unittest.cc b/googletest/googletest/samples/sample8_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample8_unittest.cc rename to googletest/googletest/samples/sample8_unittest.cc diff --git a/testing/googletest/googletest/samples/sample9_unittest.cc b/googletest/googletest/samples/sample9_unittest.cc similarity index 100% rename from testing/googletest/googletest/samples/sample9_unittest.cc rename to googletest/googletest/samples/sample9_unittest.cc diff --git a/testing/googletest/googletest/scripts/common.py b/googletest/googletest/scripts/common.py similarity index 100% rename from testing/googletest/googletest/scripts/common.py rename to googletest/googletest/scripts/common.py diff --git a/testing/googletest/googletest/scripts/fuse_gtest_files.py b/googletest/googletest/scripts/fuse_gtest_files.py similarity index 100% rename from testing/googletest/googletest/scripts/fuse_gtest_files.py rename to googletest/googletest/scripts/fuse_gtest_files.py diff --git a/testing/googletest/googletest/scripts/gen_gtest_pred_impl.py b/googletest/googletest/scripts/gen_gtest_pred_impl.py similarity index 100% rename from testing/googletest/googletest/scripts/gen_gtest_pred_impl.py rename to googletest/googletest/scripts/gen_gtest_pred_impl.py diff --git a/testing/googletest/googletest/scripts/gtest-config.in b/googletest/googletest/scripts/gtest-config.in similarity index 100% rename from testing/googletest/googletest/scripts/gtest-config.in rename to googletest/googletest/scripts/gtest-config.in diff --git a/testing/googletest/googletest/scripts/pump.py b/googletest/googletest/scripts/pump.py similarity index 100% rename from testing/googletest/googletest/scripts/pump.py rename to googletest/googletest/scripts/pump.py diff --git a/testing/googletest/googletest/scripts/release_docs.py b/googletest/googletest/scripts/release_docs.py similarity index 100% rename from testing/googletest/googletest/scripts/release_docs.py rename to googletest/googletest/scripts/release_docs.py diff --git a/testing/googletest/googletest/scripts/upload.py b/googletest/googletest/scripts/upload.py similarity index 100% rename from testing/googletest/googletest/scripts/upload.py rename to googletest/googletest/scripts/upload.py diff --git a/testing/googletest/googletest/scripts/upload_gtest.py b/googletest/googletest/scripts/upload_gtest.py similarity index 100% rename from testing/googletest/googletest/scripts/upload_gtest.py rename to googletest/googletest/scripts/upload_gtest.py diff --git a/testing/googletest/googletest/src/gtest-all.cc b/googletest/googletest/src/gtest-all.cc similarity index 100% rename from testing/googletest/googletest/src/gtest-all.cc rename to googletest/googletest/src/gtest-all.cc diff --git a/testing/googletest/googletest/src/gtest-death-test.cc b/googletest/googletest/src/gtest-death-test.cc similarity index 100% rename from testing/googletest/googletest/src/gtest-death-test.cc rename to googletest/googletest/src/gtest-death-test.cc diff --git a/testing/googletest/googletest/src/gtest-filepath.cc b/googletest/googletest/src/gtest-filepath.cc similarity index 100% rename from testing/googletest/googletest/src/gtest-filepath.cc rename to googletest/googletest/src/gtest-filepath.cc diff --git a/testing/googletest/googletest/src/gtest-internal-inl.h b/googletest/googletest/src/gtest-internal-inl.h similarity index 100% rename from testing/googletest/googletest/src/gtest-internal-inl.h rename to googletest/googletest/src/gtest-internal-inl.h diff --git a/testing/googletest/googletest/src/gtest-matchers.cc b/googletest/googletest/src/gtest-matchers.cc similarity index 100% rename from testing/googletest/googletest/src/gtest-matchers.cc rename to googletest/googletest/src/gtest-matchers.cc diff --git a/testing/googletest/googletest/src/gtest-port.cc b/googletest/googletest/src/gtest-port.cc similarity index 100% rename from testing/googletest/googletest/src/gtest-port.cc rename to googletest/googletest/src/gtest-port.cc diff --git a/testing/googletest/googletest/src/gtest-printers.cc b/googletest/googletest/src/gtest-printers.cc similarity index 100% rename from testing/googletest/googletest/src/gtest-printers.cc rename to googletest/googletest/src/gtest-printers.cc diff --git a/testing/googletest/googletest/src/gtest-test-part.cc b/googletest/googletest/src/gtest-test-part.cc similarity index 100% rename from testing/googletest/googletest/src/gtest-test-part.cc rename to googletest/googletest/src/gtest-test-part.cc diff --git a/testing/googletest/googletest/src/gtest-typed-test.cc b/googletest/googletest/src/gtest-typed-test.cc similarity index 100% rename from testing/googletest/googletest/src/gtest-typed-test.cc rename to googletest/googletest/src/gtest-typed-test.cc diff --git a/testing/googletest/googletest/src/gtest.cc b/googletest/googletest/src/gtest.cc similarity index 100% rename from testing/googletest/googletest/src/gtest.cc rename to googletest/googletest/src/gtest.cc diff --git a/testing/googletest/googletest/src/gtest_main.cc b/googletest/googletest/src/gtest_main.cc similarity index 100% rename from testing/googletest/googletest/src/gtest_main.cc rename to googletest/googletest/src/gtest_main.cc diff --git a/testing/googletest/googletest/test/BUILD.bazel b/googletest/googletest/test/BUILD.bazel similarity index 100% rename from testing/googletest/googletest/test/BUILD.bazel rename to googletest/googletest/test/BUILD.bazel diff --git a/testing/googletest/googletest/test/googletest-break-on-failure-unittest.py b/googletest/googletest/test/googletest-break-on-failure-unittest.py similarity index 100% rename from testing/googletest/googletest/test/googletest-break-on-failure-unittest.py rename to googletest/googletest/test/googletest-break-on-failure-unittest.py diff --git a/testing/googletest/googletest/test/googletest-break-on-failure-unittest_.cc b/googletest/googletest/test/googletest-break-on-failure-unittest_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-break-on-failure-unittest_.cc rename to googletest/googletest/test/googletest-break-on-failure-unittest_.cc diff --git a/testing/googletest/googletest/test/googletest-catch-exceptions-test.py b/googletest/googletest/test/googletest-catch-exceptions-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-catch-exceptions-test.py rename to googletest/googletest/test/googletest-catch-exceptions-test.py diff --git a/testing/googletest/googletest/test/googletest-catch-exceptions-test_.cc b/googletest/googletest/test/googletest-catch-exceptions-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-catch-exceptions-test_.cc rename to googletest/googletest/test/googletest-catch-exceptions-test_.cc diff --git a/testing/googletest/googletest/test/googletest-color-test.py b/googletest/googletest/test/googletest-color-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-color-test.py rename to googletest/googletest/test/googletest-color-test.py diff --git a/testing/googletest/googletest/test/googletest-color-test_.cc b/googletest/googletest/test/googletest-color-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-color-test_.cc rename to googletest/googletest/test/googletest-color-test_.cc diff --git a/testing/googletest/googletest/test/googletest-death-test-test.cc b/googletest/googletest/test/googletest-death-test-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-death-test-test.cc rename to googletest/googletest/test/googletest-death-test-test.cc diff --git a/testing/googletest/googletest/test/googletest-death-test_ex_test.cc b/googletest/googletest/test/googletest-death-test_ex_test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-death-test_ex_test.cc rename to googletest/googletest/test/googletest-death-test_ex_test.cc diff --git a/testing/googletest/googletest/test/googletest-env-var-test.py b/googletest/googletest/test/googletest-env-var-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-env-var-test.py rename to googletest/googletest/test/googletest-env-var-test.py diff --git a/testing/googletest/googletest/test/googletest-env-var-test_.cc b/googletest/googletest/test/googletest-env-var-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-env-var-test_.cc rename to googletest/googletest/test/googletest-env-var-test_.cc diff --git a/testing/googletest/googletest/test/googletest-filepath-test.cc b/googletest/googletest/test/googletest-filepath-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-filepath-test.cc rename to googletest/googletest/test/googletest-filepath-test.cc diff --git a/testing/googletest/googletest/test/googletest-filter-unittest.py b/googletest/googletest/test/googletest-filter-unittest.py similarity index 100% rename from testing/googletest/googletest/test/googletest-filter-unittest.py rename to googletest/googletest/test/googletest-filter-unittest.py diff --git a/testing/googletest/googletest/test/googletest-filter-unittest_.cc b/googletest/googletest/test/googletest-filter-unittest_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-filter-unittest_.cc rename to googletest/googletest/test/googletest-filter-unittest_.cc diff --git a/testing/googletest/googletest/test/googletest-json-outfiles-test.py b/googletest/googletest/test/googletest-json-outfiles-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-json-outfiles-test.py rename to googletest/googletest/test/googletest-json-outfiles-test.py diff --git a/testing/googletest/googletest/test/googletest-json-output-unittest.py b/googletest/googletest/test/googletest-json-output-unittest.py similarity index 100% rename from testing/googletest/googletest/test/googletest-json-output-unittest.py rename to googletest/googletest/test/googletest-json-output-unittest.py diff --git a/testing/googletest/googletest/test/googletest-list-tests-unittest.py b/googletest/googletest/test/googletest-list-tests-unittest.py similarity index 100% rename from testing/googletest/googletest/test/googletest-list-tests-unittest.py rename to googletest/googletest/test/googletest-list-tests-unittest.py diff --git a/testing/googletest/googletest/test/googletest-list-tests-unittest_.cc b/googletest/googletest/test/googletest-list-tests-unittest_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-list-tests-unittest_.cc rename to googletest/googletest/test/googletest-list-tests-unittest_.cc diff --git a/testing/googletest/googletest/test/googletest-listener-test.cc b/googletest/googletest/test/googletest-listener-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-listener-test.cc rename to googletest/googletest/test/googletest-listener-test.cc diff --git a/testing/googletest/googletest/test/googletest-message-test.cc b/googletest/googletest/test/googletest-message-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-message-test.cc rename to googletest/googletest/test/googletest-message-test.cc diff --git a/testing/googletest/googletest/test/googletest-options-test.cc b/googletest/googletest/test/googletest-options-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-options-test.cc rename to googletest/googletest/test/googletest-options-test.cc diff --git a/testing/googletest/googletest/test/googletest-output-test-golden-lin.txt b/googletest/googletest/test/googletest-output-test-golden-lin.txt similarity index 100% rename from testing/googletest/googletest/test/googletest-output-test-golden-lin.txt rename to googletest/googletest/test/googletest-output-test-golden-lin.txt diff --git a/testing/googletest/googletest/test/googletest-output-test.py b/googletest/googletest/test/googletest-output-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-output-test.py rename to googletest/googletest/test/googletest-output-test.py diff --git a/testing/googletest/googletest/test/googletest-output-test_.cc b/googletest/googletest/test/googletest-output-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-output-test_.cc rename to googletest/googletest/test/googletest-output-test_.cc diff --git a/testing/googletest/googletest/test/googletest-param-test-invalid-name1-test.py b/googletest/googletest/test/googletest-param-test-invalid-name1-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-param-test-invalid-name1-test.py rename to googletest/googletest/test/googletest-param-test-invalid-name1-test.py diff --git a/testing/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc b/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc rename to googletest/googletest/test/googletest-param-test-invalid-name1-test_.cc diff --git a/testing/googletest/googletest/test/googletest-param-test-invalid-name2-test.py b/googletest/googletest/test/googletest-param-test-invalid-name2-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-param-test-invalid-name2-test.py rename to googletest/googletest/test/googletest-param-test-invalid-name2-test.py diff --git a/testing/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc b/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc rename to googletest/googletest/test/googletest-param-test-invalid-name2-test_.cc diff --git a/testing/googletest/googletest/test/googletest-param-test-test.cc b/googletest/googletest/test/googletest-param-test-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-param-test-test.cc rename to googletest/googletest/test/googletest-param-test-test.cc diff --git a/testing/googletest/googletest/test/googletest-param-test-test.h b/googletest/googletest/test/googletest-param-test-test.h similarity index 100% rename from testing/googletest/googletest/test/googletest-param-test-test.h rename to googletest/googletest/test/googletest-param-test-test.h diff --git a/testing/googletest/googletest/test/googletest-param-test2-test.cc b/googletest/googletest/test/googletest-param-test2-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-param-test2-test.cc rename to googletest/googletest/test/googletest-param-test2-test.cc diff --git a/testing/googletest/googletest/test/googletest-port-test.cc b/googletest/googletest/test/googletest-port-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-port-test.cc rename to googletest/googletest/test/googletest-port-test.cc diff --git a/testing/googletest/googletest/test/googletest-printers-test.cc b/googletest/googletest/test/googletest-printers-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-printers-test.cc rename to googletest/googletest/test/googletest-printers-test.cc diff --git a/testing/googletest/googletest/test/googletest-shuffle-test.py b/googletest/googletest/test/googletest-shuffle-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-shuffle-test.py rename to googletest/googletest/test/googletest-shuffle-test.py diff --git a/testing/googletest/googletest/test/googletest-shuffle-test_.cc b/googletest/googletest/test/googletest-shuffle-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-shuffle-test_.cc rename to googletest/googletest/test/googletest-shuffle-test_.cc diff --git a/testing/googletest/googletest/test/googletest-test-part-test.cc b/googletest/googletest/test/googletest-test-part-test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-test-part-test.cc rename to googletest/googletest/test/googletest-test-part-test.cc diff --git a/testing/googletest/googletest/test/googletest-test2_test.cc b/googletest/googletest/test/googletest-test2_test.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-test2_test.cc rename to googletest/googletest/test/googletest-test2_test.cc diff --git a/testing/googletest/googletest/test/googletest-throw-on-failure-test.py b/googletest/googletest/test/googletest-throw-on-failure-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-throw-on-failure-test.py rename to googletest/googletest/test/googletest-throw-on-failure-test.py diff --git a/testing/googletest/googletest/test/googletest-throw-on-failure-test_.cc b/googletest/googletest/test/googletest-throw-on-failure-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-throw-on-failure-test_.cc rename to googletest/googletest/test/googletest-throw-on-failure-test_.cc diff --git a/testing/googletest/googletest/test/googletest-uninitialized-test.py b/googletest/googletest/test/googletest-uninitialized-test.py similarity index 100% rename from testing/googletest/googletest/test/googletest-uninitialized-test.py rename to googletest/googletest/test/googletest-uninitialized-test.py diff --git a/testing/googletest/googletest/test/googletest-uninitialized-test_.cc b/googletest/googletest/test/googletest-uninitialized-test_.cc similarity index 100% rename from testing/googletest/googletest/test/googletest-uninitialized-test_.cc rename to googletest/googletest/test/googletest-uninitialized-test_.cc diff --git a/testing/googletest/googletest/test/gtest-typed-test2_test.cc b/googletest/googletest/test/gtest-typed-test2_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest-typed-test2_test.cc rename to googletest/googletest/test/gtest-typed-test2_test.cc diff --git a/testing/googletest/googletest/test/gtest-typed-test_test.cc b/googletest/googletest/test/gtest-typed-test_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest-typed-test_test.cc rename to googletest/googletest/test/gtest-typed-test_test.cc diff --git a/testing/googletest/googletest/test/gtest-typed-test_test.h b/googletest/googletest/test/gtest-typed-test_test.h similarity index 100% rename from testing/googletest/googletest/test/gtest-typed-test_test.h rename to googletest/googletest/test/gtest-typed-test_test.h diff --git a/testing/googletest/googletest/test/gtest-unittest-api_test.cc b/googletest/googletest/test/gtest-unittest-api_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest-unittest-api_test.cc rename to googletest/googletest/test/gtest-unittest-api_test.cc diff --git a/testing/googletest/googletest/test/gtest_all_test.cc b/googletest/googletest/test/gtest_all_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_all_test.cc rename to googletest/googletest/test/gtest_all_test.cc diff --git a/testing/googletest/googletest/test/gtest_assert_by_exception_test.cc b/googletest/googletest/test/gtest_assert_by_exception_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_assert_by_exception_test.cc rename to googletest/googletest/test/gtest_assert_by_exception_test.cc diff --git a/testing/googletest/googletest/test/gtest_environment_test.cc b/googletest/googletest/test/gtest_environment_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_environment_test.cc rename to googletest/googletest/test/gtest_environment_test.cc diff --git a/testing/googletest/googletest/test/gtest_help_test.py b/googletest/googletest/test/gtest_help_test.py similarity index 100% rename from testing/googletest/googletest/test/gtest_help_test.py rename to googletest/googletest/test/gtest_help_test.py diff --git a/testing/googletest/googletest/test/gtest_help_test_.cc b/googletest/googletest/test/gtest_help_test_.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_help_test_.cc rename to googletest/googletest/test/gtest_help_test_.cc diff --git a/testing/googletest/googletest/test/gtest_json_test_utils.py b/googletest/googletest/test/gtest_json_test_utils.py similarity index 100% rename from testing/googletest/googletest/test/gtest_json_test_utils.py rename to googletest/googletest/test/gtest_json_test_utils.py diff --git a/testing/googletest/googletest/test/gtest_list_output_unittest.py b/googletest/googletest/test/gtest_list_output_unittest.py similarity index 100% rename from testing/googletest/googletest/test/gtest_list_output_unittest.py rename to googletest/googletest/test/gtest_list_output_unittest.py diff --git a/testing/googletest/googletest/test/gtest_list_output_unittest_.cc b/googletest/googletest/test/gtest_list_output_unittest_.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_list_output_unittest_.cc rename to googletest/googletest/test/gtest_list_output_unittest_.cc diff --git a/testing/googletest/googletest/test/gtest_main_unittest.cc b/googletest/googletest/test/gtest_main_unittest.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_main_unittest.cc rename to googletest/googletest/test/gtest_main_unittest.cc diff --git a/testing/googletest/googletest/test/gtest_no_test_unittest.cc b/googletest/googletest/test/gtest_no_test_unittest.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_no_test_unittest.cc rename to googletest/googletest/test/gtest_no_test_unittest.cc diff --git a/testing/googletest/googletest/test/gtest_pred_impl_unittest.cc b/googletest/googletest/test/gtest_pred_impl_unittest.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_pred_impl_unittest.cc rename to googletest/googletest/test/gtest_pred_impl_unittest.cc diff --git a/testing/googletest/googletest/test/gtest_premature_exit_test.cc b/googletest/googletest/test/gtest_premature_exit_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_premature_exit_test.cc rename to googletest/googletest/test/gtest_premature_exit_test.cc diff --git a/testing/googletest/googletest/test/gtest_prod_test.cc b/googletest/googletest/test/gtest_prod_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_prod_test.cc rename to googletest/googletest/test/gtest_prod_test.cc diff --git a/testing/googletest/googletest/test/gtest_repeat_test.cc b/googletest/googletest/test/gtest_repeat_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_repeat_test.cc rename to googletest/googletest/test/gtest_repeat_test.cc diff --git a/testing/googletest/googletest/test/gtest_skip_environment_check_output_test.py b/googletest/googletest/test/gtest_skip_environment_check_output_test.py similarity index 100% rename from testing/googletest/googletest/test/gtest_skip_environment_check_output_test.py rename to googletest/googletest/test/gtest_skip_environment_check_output_test.py diff --git a/testing/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc b/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_skip_in_environment_setup_test.cc rename to googletest/googletest/test/gtest_skip_in_environment_setup_test.cc diff --git a/testing/googletest/googletest/test/gtest_skip_test.cc b/googletest/googletest/test/gtest_skip_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_skip_test.cc rename to googletest/googletest/test/gtest_skip_test.cc diff --git a/testing/googletest/googletest/test/gtest_sole_header_test.cc b/googletest/googletest/test/gtest_sole_header_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_sole_header_test.cc rename to googletest/googletest/test/gtest_sole_header_test.cc diff --git a/testing/googletest/googletest/test/gtest_stress_test.cc b/googletest/googletest/test/gtest_stress_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_stress_test.cc rename to googletest/googletest/test/gtest_stress_test.cc diff --git a/testing/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc b/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc rename to googletest/googletest/test/gtest_test_macro_stack_footprint_test.cc diff --git a/testing/googletest/googletest/test/gtest_test_utils.py b/googletest/googletest/test/gtest_test_utils.py similarity index 100% rename from testing/googletest/googletest/test/gtest_test_utils.py rename to googletest/googletest/test/gtest_test_utils.py diff --git a/testing/googletest/googletest/test/gtest_testbridge_test.py b/googletest/googletest/test/gtest_testbridge_test.py similarity index 100% rename from testing/googletest/googletest/test/gtest_testbridge_test.py rename to googletest/googletest/test/gtest_testbridge_test.py diff --git a/testing/googletest/googletest/test/gtest_testbridge_test_.cc b/googletest/googletest/test/gtest_testbridge_test_.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_testbridge_test_.cc rename to googletest/googletest/test/gtest_testbridge_test_.cc diff --git a/testing/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc b/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc rename to googletest/googletest/test/gtest_throw_on_failure_ex_test.cc diff --git a/testing/googletest/googletest/test/gtest_unittest.cc b/googletest/googletest/test/gtest_unittest.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_unittest.cc rename to googletest/googletest/test/gtest_unittest.cc diff --git a/testing/googletest/googletest/test/gtest_xml_outfile1_test_.cc b/googletest/googletest/test/gtest_xml_outfile1_test_.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_xml_outfile1_test_.cc rename to googletest/googletest/test/gtest_xml_outfile1_test_.cc diff --git a/testing/googletest/googletest/test/gtest_xml_outfile2_test_.cc b/googletest/googletest/test/gtest_xml_outfile2_test_.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_xml_outfile2_test_.cc rename to googletest/googletest/test/gtest_xml_outfile2_test_.cc diff --git a/testing/googletest/googletest/test/gtest_xml_outfiles_test.py b/googletest/googletest/test/gtest_xml_outfiles_test.py similarity index 100% rename from testing/googletest/googletest/test/gtest_xml_outfiles_test.py rename to googletest/googletest/test/gtest_xml_outfiles_test.py diff --git a/testing/googletest/googletest/test/gtest_xml_output_unittest.py b/googletest/googletest/test/gtest_xml_output_unittest.py similarity index 100% rename from testing/googletest/googletest/test/gtest_xml_output_unittest.py rename to googletest/googletest/test/gtest_xml_output_unittest.py diff --git a/testing/googletest/googletest/test/gtest_xml_output_unittest_.cc b/googletest/googletest/test/gtest_xml_output_unittest_.cc similarity index 100% rename from testing/googletest/googletest/test/gtest_xml_output_unittest_.cc rename to googletest/googletest/test/gtest_xml_output_unittest_.cc diff --git a/testing/googletest/googletest/test/gtest_xml_test_utils.py b/googletest/googletest/test/gtest_xml_test_utils.py similarity index 100% rename from testing/googletest/googletest/test/gtest_xml_test_utils.py rename to googletest/googletest/test/gtest_xml_test_utils.py diff --git a/testing/googletest/googletest/test/production.cc b/googletest/googletest/test/production.cc similarity index 100% rename from testing/googletest/googletest/test/production.cc rename to googletest/googletest/test/production.cc diff --git a/testing/googletest/googletest/test/production.h b/googletest/googletest/test/production.h similarity index 100% rename from testing/googletest/googletest/test/production.h rename to googletest/googletest/test/production.h diff --git a/testing/googletest/library.json b/googletest/library.json similarity index 100% rename from testing/googletest/library.json rename to googletest/library.json diff --git a/testing/googletest/platformio.ini b/googletest/platformio.ini similarity index 100% rename from testing/googletest/platformio.ini rename to googletest/platformio.ini diff --git a/testing/.gitignore b/gtest-arduino/.gitignore similarity index 100% rename from testing/.gitignore rename to gtest-arduino/.gitignore diff --git a/gtest-arduino/library.properties b/gtest-arduino/library.properties new file mode 100644 index 00000000..7c683972 --- /dev/null +++ b/gtest-arduino/library.properties @@ -0,0 +1,10 @@ +name=gtest-arduino +version=1.10.0 +author=Google LLC +maintainer=Google LLC +sentence=A copy of v1.10.0 of googletest. +paragraph=... +category=Testing +url=https://github.com/google/googletest +architectures=* +dot_a_linkage=true diff --git a/gtest-arduino/src/gtest b/gtest-arduino/src/gtest new file mode 120000 index 00000000..ee90ba31 --- /dev/null +++ b/gtest-arduino/src/gtest @@ -0,0 +1 @@ +../../googletest/googletest/include/gtest \ No newline at end of file diff --git a/gtest-arduino/src/src b/gtest-arduino/src/src new file mode 120000 index 00000000..23315778 --- /dev/null +++ b/gtest-arduino/src/src @@ -0,0 +1 @@ +../../googletest/googletest/src \ No newline at end of file diff --git a/testing/Makefile b/testing/Makefile index 21ebce8a..43b6af1e 100644 --- a/testing/Makefile +++ b/testing/Makefile @@ -6,16 +6,13 @@ all: ${TEST_DIRS} Makefile: ${TEST_DIRS} @: -%: FORCE +%: FORCE @if [ ! -f "$@/tests.h" ]; then \ echo 'Unable to find test file "$@/tests.h"'; \ else \ echo "Running tests in $@"; \ - echo "env LOCAL_CFLAGS='-DTESTING_INCLUDE_FILE="$@/tests.h" "-I$(PWD)/$@"' VERBOSE=1 $(MAKE) -f delegate.mk"; \ env LOCAL_CFLAGS='-DTESTING_INCLUDE_FILE="$@/tests.h" "-I$(PWD)/$@"' VERBOSE=1 $(MAKE) -f delegate.mk; \ fi .PHONY: FORCE - - diff --git a/testing/hello-simulator/hello-simulator_test.cpp b/testing/hello-simulator/hello-simulator_test.h similarity index 100% rename from testing/hello-simulator/hello-simulator_test.cpp rename to testing/hello-simulator/hello-simulator_test.h diff --git a/testing/hello-simulator/tests.h b/testing/hello-simulator/tests.h index 2eb68c33..9ebffde9 100644 --- a/testing/hello-simulator/tests.h +++ b/testing/hello-simulator/tests.h @@ -1 +1 @@ -#include "./hello-simulator_test.cpp" +#include "./hello-simulator_test.h"