Merge pull request #211 from OpenShot/rename-cmake-test

Fix cmake 3 error for `make test`

Author: jonoomph

.travis.yml

@@ -15,7 +15,7 @@ matrix:
       - mkdir -p build; cd build;
       - cmake -D"CMAKE_BUILD_TYPE:STRING=Debug" ../
       - make VERBOSE=1
-      - make test
+      - make os_test
 
     - language: cpp
       name: "FFmpeg 3"
@@ -30,7 +30,7 @@ matrix:
       - mkdir -p build; cd build;
       - cmake -D"CMAKE_BUILD_TYPE:STRING=Debug" ../
       - make VERBOSE=1
-      - make test
+      - make os_test
 
     - language: cpp
       name: "FFmpeg 4"
@@ -47,4 +47,4 @@ matrix:
       - mkdir -p build; cd build;
       - cmake -D"CMAKE_BUILD_TYPE:STRING=Debug" ../
       - make VERBOSE=1
-      - make test
+      - make os_test

tests/CMakeLists.txt

@@ -224,8 +224,7 @@ IF (NOT DISABLE_TESTS)
 	# Link libraries to the new executable
 	target_link_libraries(openshot-test openshot ${UNITTEST++_LIBRARY})
 
-
 	#################### MAKE TEST ######################
-	# Hook up the 'make test' target to the 'openshot-test' executable
-	ADD_CUSTOM_TARGET(test ${CMAKE_CURRENT_BINARY_DIR}/openshot-test)
+	# Hook up the 'make os_test' target to the 'openshot-test' executable
+	ADD_CUSTOM_TARGET(os_test ${CMAKE_CURRENT_BINARY_DIR}/openshot-test)
 ENDIF (NOT DISABLE_TESTS)