Merge pull request LLNL#145 from LLNL/task/host-configs

Moves host-configs to root directory and reorganizes test directories
evaleev · Apr 13, 2018 · b1bbce0 · b1bbce0
2 parents dd12d36 + a017231
commit b1bbce0
Show file tree

Hide file tree

Showing 37 changed files with 17 additions and 72 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -130,7 +130,7 @@ script:
   - cmake --version
   - cd $TRAVIS_BUILD_DIR/..
   # copy our internal testing project
-  - cp -r blt/cmake/blt-test .
+  - cp -r blt/tests/internal blt-test
   # create a git repo for blt-test to test the git macros
   - cd blt-test
   - git init
@@ -173,6 +173,8 @@ script:
   - CMAKE_OPTS="${CMAKE_OPTS} -DMPI_C_COMPILER=mpicc"
   - CMAKE_OPTS="${CMAKE_OPTS} -DMPI_CXX_COMPILER=mpicc"
   - CMAKE_OPTS="${CMAKE_OPTS} -DMPI_Fortran_COMPILER=mpif90"
+  # test git macros
+  - CMAKE_OPTS="${CMAKE_OPTS} -DTEST_GIT_MACROS=ON"
   # configure with cmake
   - cmake  ${CMAKE_OPTS} ../blt-test
   # build, link, and triumph 

diff --git a/SetupBLT.cmake b/SetupBLT.cmake
@@ -199,7 +199,7 @@ if (NOT BLT_LOADED)
   # BLT smoke tests
   ################################
   if(ENABLE_TESTS)
-      add_subdirectory(${BLT_ROOT_DIR}/tests ${BLT_BUILD_DIR}/tests)
+      add_subdirectory(${BLT_ROOT_DIR}/tests/smoke ${BLT_BUILD_DIR}/tests/smoke)
   endif()
 
 endif() # only load BLT once!
diff --git a/appveyor.yml b/appveyor.yml
@@ -52,7 +52,7 @@ before_build:
   # copy blt into blt-test and setup to build there
   - ps: cd ..
   - mkdir build
-  - cp -r blt\cmake\blt-test .
+  - cp -r blt\tests\internal blt-test
   # create a git repo for blt-test to test the git macros
   - cd blt-test
   - git init
@@ -81,6 +81,7 @@ build_script:
       -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" ^
       -D MPI_CXX_INCLUDE_PATH:PATH="%MPI_HOME%/Include" ^
       -D MPI_CXX_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" ^
+      -D TEST_GIT_MACROS=ON ^
       ..\blt-test
   - cd ..
   #build

diff --git a/docs/tutorial/host-configs/[email protected] b/docs/tutorial/host-configs/[email protected]
diff --git a/docs/tutorial/host-configs/[email protected] b/docs/tutorial/host-configs/[email protected]
diff --git a/[email protected] → [email protected] b/[email protected] → [email protected]
diff --git a/...configs/[email protected] → ...configs/[email protected] b/...configs/[email protected] → ...configs/[email protected]
diff --git a/...configs/[email protected] → ...configs/[email protected] b/...configs/[email protected] → ...configs/[email protected]
diff --git a/...-configs/[email protected] → ...-configs/[email protected] b/...-configs/[email protected] → ...-configs/[email protected]
diff --git a/[email protected] → [email protected] b/[email protected] → [email protected]
diff --git a/cmake/blt-test/host-configs/rocm.cmake → host-configs/rocm.cmake b/cmake/blt-test/host-configs/rocm.cmake → host-configs/rocm.cmake
diff --git a/cmake/blt-test/CMakeLists.txt → tests/internal/CMakeLists.txt b/cmake/blt-test/CMakeLists.txt → tests/internal/CMakeLists.txt
@@ -54,7 +54,7 @@ project(blt-example LANGUAGES C CXX)
 ###############################################################################
 # Set BLT_SOURCE_DIR to default location, if not set by user 
 if(NOT BLT_SOURCE_DIR)
-    set(BLT_SOURCE_DIR "blt")
+    set(BLT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../..")
 endif()
 
 include(${BLT_SOURCE_DIR}/SetupBLT.cmake)
@@ -63,6 +63,15 @@ if(WIN32 AND ENABLE_SHARED_LIBS)
     add_definitions("-DWIN32_SHARED_LIBS")
 endif()
 
+
+################################
+# Project options
+################################
+option(TEST_GIT_MACROS 
+       "Toggle smoke tests for git macros. Off by default since it requires a modified git repo." 
+       OFF)
+
+
 ################################
 # Add a library
 ################################
@@ -109,7 +118,7 @@ if(ENABLE_GTEST)
     ####################
     # Git Macros test
     ####################
-    if ( GIT_FOUND )
+    if ( GIT_FOUND AND TEST_GIT_MACROS)
 
       blt_is_git_repo( OUTPUT_STATE is_git_repo
                        SOURCE_DIR ${PROJECT_SOURCE_DIR} )

diff --git a/cmake/blt-test/src/Example.cpp → tests/internal/src/Example.cpp b/cmake/blt-test/src/Example.cpp → tests/internal/src/Example.cpp
diff --git a/cmake/blt-test/src/Example.hpp → tests/internal/src/Example.hpp b/cmake/blt-test/src/Example.hpp → tests/internal/src/Example.hpp
diff --git a/cmake/blt-test/src/Example_Exports.h → tests/internal/src/Example_Exports.h b/cmake/blt-test/src/Example_Exports.h → tests/internal/src/Example_Exports.h
diff --git a/cmake/blt-test/src/HeaderOnly.hpp → tests/internal/src/HeaderOnly.hpp b/cmake/blt-test/src/HeaderOnly.hpp → tests/internal/src/HeaderOnly.hpp
diff --git a/cmake/blt-test/src/t_example_smoke.cpp → tests/internal/src/t_example_smoke.cpp b/cmake/blt-test/src/t_example_smoke.cpp → tests/internal/src/t_example_smoke.cpp
diff --git a/cmake/blt-test/src/t_git_macros_smoke.cpp.in → tests/internal/src/t_git_macros_smoke.cpp.in b/cmake/blt-test/src/t_git_macros_smoke.cpp.in → tests/internal/src/t_git_macros_smoke.cpp.in
diff --git a/cmake/blt-test/src/t_header_only_smoke.cpp → tests/internal/src/t_header_only_smoke.cpp b/cmake/blt-test/src/t_header_only_smoke.cpp → tests/internal/src/t_header_only_smoke.cpp
diff --git a/...da_device_call_from_kernel/CMakeLists.txt → ...da_device_call_from_kernel/CMakeLists.txt b/...da_device_call_from_kernel/CMakeLists.txt → ...da_device_call_from_kernel/CMakeLists.txt
diff --git a/...st_cuda_device_call_from_kernel/Child.cxx → ...st_cuda_device_call_from_kernel/Child.cxx b/...st_cuda_device_call_from_kernel/Child.cxx → ...st_cuda_device_call_from_kernel/Child.cxx
diff --git a/...test_cuda_device_call_from_kernel/Child.h → ...test_cuda_device_call_from_kernel/Child.h b/...test_cuda_device_call_from_kernel/Child.h → ...test_cuda_device_call_from_kernel/Child.h
diff --git a/...uda_device_call_from_kernel/CudaTests.cxx → ...uda_device_call_from_kernel/CudaTests.cxx b/...uda_device_call_from_kernel/CudaTests.cxx → ...uda_device_call_from_kernel/CudaTests.cxx
diff --git a/...t_cuda_device_call_from_kernel/Parent.cxx → ...t_cuda_device_call_from_kernel/Parent.cxx b/...t_cuda_device_call_from_kernel/Parent.cxx → ...t_cuda_device_call_from_kernel/Parent.cxx
diff --git a/...est_cuda_device_call_from_kernel/Parent.h → ...est_cuda_device_call_from_kernel/Parent.h b/...est_cuda_device_call_from_kernel/Parent.h → ...est_cuda_device_call_from_kernel/Parent.h
diff --git a/tests/CMakeLists.txt → tests/smoke/CMakeLists.txt b/tests/CMakeLists.txt → tests/smoke/CMakeLists.txt
diff --git a/tests/blt_cuda_runtime_smoke.cpp → tests/smoke/blt_cuda_runtime_smoke.cpp b/tests/blt_cuda_runtime_smoke.cpp → tests/smoke/blt_cuda_runtime_smoke.cpp
diff --git a/tests/blt_cuda_smoke.cpp → tests/smoke/blt_cuda_smoke.cpp b/tests/blt_cuda_smoke.cpp → tests/smoke/blt_cuda_smoke.cpp
diff --git a/tests/blt_fruit_smoke.f90 → tests/smoke/blt_fruit_smoke.f90 b/tests/blt_fruit_smoke.f90 → tests/smoke/blt_fruit_smoke.f90
diff --git a/tests/blt_gbenchmark_smoke.cpp → tests/smoke/blt_gbenchmark_smoke.cpp b/tests/blt_gbenchmark_smoke.cpp → tests/smoke/blt_gbenchmark_smoke.cpp
diff --git a/tests/blt_gmock_smoke.cpp → tests/smoke/blt_gmock_smoke.cpp b/tests/blt_gmock_smoke.cpp → tests/smoke/blt_gmock_smoke.cpp
diff --git a/tests/blt_gtest_smoke.cpp → tests/smoke/blt_gtest_smoke.cpp b/tests/blt_gtest_smoke.cpp → tests/smoke/blt_gtest_smoke.cpp
diff --git a/tests/blt_mpi_smoke.cpp → tests/smoke/blt_mpi_smoke.cpp b/tests/blt_mpi_smoke.cpp → tests/smoke/blt_mpi_smoke.cpp
diff --git a/tests/blt_openmp_smoke.cpp → tests/smoke/blt_openmp_smoke.cpp b/tests/blt_openmp_smoke.cpp → tests/smoke/blt_openmp_smoke.cpp
diff --git a/tests/blt_rocm_runtime_smoke.cpp → tests/smoke/blt_rocm_runtime_smoke.cpp b/tests/blt_rocm_runtime_smoke.cpp → tests/smoke/blt_rocm_runtime_smoke.cpp
diff --git a/tests/blt_rocm_smoke.cpp → tests/smoke/blt_rocm_smoke.cpp b/tests/blt_rocm_smoke.cpp → tests/smoke/blt_rocm_smoke.cpp
diff --git a/tests/fortran_driver.cpp → tests/smoke/fortran_driver.cpp b/tests/fortran_driver.cpp → tests/smoke/fortran_driver.cpp