diff --git a/.gitignore b/.gitignore index cfb24dd..2ecbab1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ node_modules/ *.a *.so compile_commands.json -tests +/tests .DS_Store .idea diff --git a/CMakeLists.txt b/CMakeLists.txt index f6bfe43..7974ff3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,22 +128,22 @@ set(TESTS_SOURCES ) set(TESTS_UWP_RESOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-tests/Logo.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-tests/package.appxManifest - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-tests/SmallLogo.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-tests/SmallLogo44x44.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-tests/SplashScreen.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-tests/StoreLogo.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-tests/Windows_TemporaryKey.pfx) + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/Logo.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/package.appxManifest + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/SmallLogo.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/SmallLogo44x44.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/SplashScreen.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/StoreLogo.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/tests/Windows_TemporaryKey.pfx) set(BENCHMARK_UWP_RESOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-benchmark/Logo.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-benchmark/package.appxManifest - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-benchmark/SmallLogo.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-benchmark/SmallLogo44x44.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-benchmark/SplashScreen.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-benchmark/StoreLogo.png - ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp-benchmark/Windows_TemporaryKey.pfx) + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/Logo.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/package.appxManifest + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/SmallLogo.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/SmallLogo44x44.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/SplashScreen.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/StoreLogo.png + ${CMAKE_CURRENT_SOURCE_DIR}/test/uwp/benchmark/Windows_TemporaryKey.pfx) set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(THREADS_PREFER_PTHREAD_FLAG TRUE) diff --git a/test/uwp-benchmark/Logo.png b/test/uwp/benchmark/Logo.png similarity index 100% rename from test/uwp-benchmark/Logo.png rename to test/uwp/benchmark/Logo.png diff --git a/test/uwp-benchmark/SmallLogo.png b/test/uwp/benchmark/SmallLogo.png similarity index 100% rename from test/uwp-benchmark/SmallLogo.png rename to test/uwp/benchmark/SmallLogo.png diff --git a/test/uwp-benchmark/SmallLogo44x44.png b/test/uwp/benchmark/SmallLogo44x44.png similarity index 100% rename from test/uwp-benchmark/SmallLogo44x44.png rename to test/uwp/benchmark/SmallLogo44x44.png diff --git a/test/uwp-benchmark/SplashScreen.png b/test/uwp/benchmark/SplashScreen.png similarity index 100% rename from test/uwp-benchmark/SplashScreen.png rename to test/uwp/benchmark/SplashScreen.png diff --git a/test/uwp-benchmark/StoreLogo.png b/test/uwp/benchmark/StoreLogo.png similarity index 100% rename from test/uwp-benchmark/StoreLogo.png rename to test/uwp/benchmark/StoreLogo.png diff --git a/test/uwp-benchmark/Windows_TemporaryKey.pfx b/test/uwp/benchmark/Windows_TemporaryKey.pfx similarity index 100% rename from test/uwp-benchmark/Windows_TemporaryKey.pfx rename to test/uwp/benchmark/Windows_TemporaryKey.pfx diff --git a/test/uwp-benchmark/package.appxManifest b/test/uwp/benchmark/package.appxManifest similarity index 100% rename from test/uwp-benchmark/package.appxManifest rename to test/uwp/benchmark/package.appxManifest diff --git a/test/uwp-tests/Logo.png b/test/uwp/tests/Logo.png similarity index 100% rename from test/uwp-tests/Logo.png rename to test/uwp/tests/Logo.png diff --git a/test/uwp-tests/SmallLogo.png b/test/uwp/tests/SmallLogo.png similarity index 100% rename from test/uwp-tests/SmallLogo.png rename to test/uwp/tests/SmallLogo.png diff --git a/test/uwp-tests/SmallLogo44x44.png b/test/uwp/tests/SmallLogo44x44.png similarity index 100% rename from test/uwp-tests/SmallLogo44x44.png rename to test/uwp/tests/SmallLogo44x44.png diff --git a/test/uwp-tests/SplashScreen.png b/test/uwp/tests/SplashScreen.png similarity index 100% rename from test/uwp-tests/SplashScreen.png rename to test/uwp/tests/SplashScreen.png diff --git a/test/uwp-tests/StoreLogo.png b/test/uwp/tests/StoreLogo.png similarity index 100% rename from test/uwp-tests/StoreLogo.png rename to test/uwp/tests/StoreLogo.png diff --git a/test/uwp-tests/Windows_TemporaryKey.pfx b/test/uwp/tests/Windows_TemporaryKey.pfx similarity index 100% rename from test/uwp-tests/Windows_TemporaryKey.pfx rename to test/uwp/tests/Windows_TemporaryKey.pfx diff --git a/test/uwp-tests/package.appxManifest b/test/uwp/tests/package.appxManifest similarity index 100% rename from test/uwp-tests/package.appxManifest rename to test/uwp/tests/package.appxManifest