summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorhristo <[email protected]>2021-01-25 11:44:30 +0200
committerGitHub <[email protected]>2021-01-25 10:44:30 +0100
commit4bf7b00013f7efe222d02171e176bb827a90fad9 (patch)
treebda85687fff7232a111a9ee3718f9965b24cf742
parent1d23e1569219f22376144999de07900c7409d13f (diff)
downloadraylib-4bf7b00013f7efe222d02171e176bb827a90fad9.tar.gz
raylib-4bf7b00013f7efe222d02171e176bb827a90fad9.zip
Removing test file. (#1545)
This test file is just testing compilation with the library works correctly but is no longer needed because: - it is not cross platform - it taps into the CTest system which is better suited for real unit/integration tests - it can be incorporated into the pipeline of github actions instead in the future
-rw-r--r--.github/workflows/cmake.yml24
-rwxr-xr-xcmake/test-pkgconfig.sh21
-rw-r--r--src/CMakeLists.txt3
3 files changed, 12 insertions, 36 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 11aabbb0..52fbdd80 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -41,12 +41,12 @@ jobs:
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build . --config $env:BUILD_TYPE
-# - name: Test
-# working-directory: ${{github.workspace}}/build
-# shell: powershell
-# # Execute tests defined by the CMake configuration.
-# # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-# run: ctest -C $env:BUILD_TYPE
+ - name: Test
+ working-directory: ${{github.workspace}}/build
+ shell: powershell
+ # Execute tests defined by the CMake configuration.
+ # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+ run: ctest -C $env:BUILD_TYPE
build_linux:
name: Linux Build
@@ -85,9 +85,9 @@ jobs:
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build . --config $BUILD_TYPE
-# - name: Test
-# working-directory: ${{github.workspace}}/build
-# shell: bash
-# # Execute tests defined by the CMake configuration.
-# # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-# run: ctest -C $BUILD_TYPE \ No newline at end of file
+ - name: Test
+ working-directory: ${{github.workspace}}/build
+ shell: bash
+ # Execute tests defined by the CMake configuration.
+ # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+ run: ctest -C $BUILD_TYPE \ No newline at end of file
diff --git a/cmake/test-pkgconfig.sh b/cmake/test-pkgconfig.sh
deleted file mode 100755
index ccbdfb65..00000000
--- a/cmake/test-pkgconfig.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# Test if including/linking/running an installed raylib works
-
-set -x
-export LD_RUN_PATH=/usr/local/lib
-
-CFLAGS="-Wall -Wextra -Werror $CFLAGS"
-if [ "$ARCH" = "i386" ]; then
-CFLAGS="-m32 $CLFAGS"
-fi
-
-cat << EOF | ${CC:-cc} -otest -xc - $(pkg-config --libs --cflags $@ raylib.pc) $CFLAGS && exec ./test
-#include <stdlib.h>
-#include <raylib.h>
-
-int main(void)
-{
- int num = GetRandomValue(42, 1337);
- return 42 <= num && num <= 1337 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-EOF
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6416dfe..a11f4efb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,7 +56,6 @@ add_library(raylib ${raylib_sources} ${raylib_public_headers})
if (NOT BUILD_SHARED_LIBS)
MESSAGE(STATUS "Building raylib static library")
add_library(raylib_static ALIAS raylib)
- add_test("pkg-config--static" ${PROJECT_SOURCE_DIR}/../cmake/test-pkgconfig.sh --static)
else()
MESSAGE(STATUS "Building raylib shared library")
if (MSVC)
@@ -65,8 +64,6 @@ else()
INTERFACE $<INSTALL_INTERFACE:USE_LIBTYPE_SHARED>
)
endif ()
-
- add_test("pkg-config" ${PROJECT_SOURCE_DIR}/../cmake/test-pkgconfig.sh)
endif()
# Setting target properties