[arrayfire] 76/84: Test reordering: Sort by backend, then alphabetically
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Jan 4 23:22:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository arrayfire.
commit 40f2cbef76c5e885cc8735b729d917f556dad0b9
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date: Tue Dec 29 22:04:50 2015 -0500
Test reordering: Sort by backend, then alphabetically
* Mainly affects the order in which tests are executed
* Cleaner, more organized
* Tests are
* 1 - N -> CPU
* N+1 - 2N -> CUDA
* 2N+1 - 3N -> OpenCL
* 3N+1 - E -> Unified
---
test/CMakeLists.txt | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c18e3fd..44192ed 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -118,9 +118,11 @@ INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
FILE(GLOB FILES "*.cpp" "*.c")
+LIST(SORT FILES) # Tests execute in alphabetical order
# We only build info.cpp and backend.cpp for Unified backend
-SET(UNIFIED_FILES "info.cpp;backend.cpp")
+SET(UNIFIED_FILES "backend.cpp;info.cpp")
+LIST(SORT UNIFIED_FILES) # Tests execute in alphabetical order
# Next we build each example using every backend.
IF(${ArrayFire_CPU_FOUND}) # variable defined by FIND(ArrayFire ...)
@@ -133,17 +135,6 @@ ELSE()
MESSAGE(STATUS "TESTS: CPU backend is OFF. afcpu was not found.")
ENDIF()
-# Unified Backend
-IF(${ArrayFire_Unified_FOUND}) # variable defined by FIND(ArrayFire ...)
- MESSAGE(STATUS "TESTS: UNIFIED backend is ON.")
- CREATE_TESTS(unified ${ArrayFire_Unified_LIBRARIES} "${GTEST_LIBRARIES}" "${CMAKE_DL_LIBS}")
-ELSEIF(TARGET af) # variable defined by the ArrayFire build tree
- MESSAGE(STATUS "TESTS: UNIFIED backend is ON.")
- CREATE_TESTS(unified af "${GTEST_LIBRARIES}" "${CMAKE_DL_LIBS}")
-ELSE()
- MESSAGE(STATUS "TESTS: UNIFIED backend is OFF. af was not found.")
-ENDIF()
-
# CUDA Backend
IF (${CUDA_FOUND})
IF(${ArrayFire_CUDA_FOUND}) # variable defined by FIND(ArrayFire ...)
@@ -210,3 +201,14 @@ IF (${OpenCL_FOUND})
ELSE()
MESSAGE(STATUS "TESTS: OpenCL backend is OFF. OpenCL was not found")
ENDIF()
+
+# Unified Backend
+IF(${ArrayFire_Unified_FOUND}) # variable defined by FIND(ArrayFire ...)
+ MESSAGE(STATUS "TESTS: UNIFIED backend is ON.")
+ CREATE_TESTS(unified ${ArrayFire_Unified_LIBRARIES} "${GTEST_LIBRARIES}" "${CMAKE_DL_LIBS}")
+ELSEIF(TARGET af) # variable defined by the ArrayFire build tree
+ MESSAGE(STATUS "TESTS: UNIFIED backend is ON.")
+ CREATE_TESTS(unified af "${GTEST_LIBRARIES}" "${CMAKE_DL_LIBS}")
+ELSE()
+ MESSAGE(STATUS "TESTS: UNIFIED backend is OFF. af was not found.")
+ENDIF()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list