From c51e21ea696d7e2fc9b588f6641d3a044ad5667b Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Wed, 22 Mar 2023 12:57:25 +0100 Subject: [PATCH 1/3] Fix test_dramsys linker error --- tests/tests_dramsys/CMakeLists.txt | 2 +- tests/tests_dramsys/main.cpp | 43 ++++++++++++++++++++++++++++++ tests/tests_dramsys/test_misc.cpp | 5 ---- 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 tests/tests_dramsys/main.cpp diff --git a/tests/tests_dramsys/CMakeLists.txt b/tests/tests_dramsys/CMakeLists.txt index c60c83e7..c14f51c4 100644 --- a/tests/tests_dramsys/CMakeLists.txt +++ b/tests/tests_dramsys/CMakeLists.txt @@ -23,4 +23,4 @@ gtest_discover_tests(${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) -build_source_group() \ No newline at end of file +build_source_group() diff --git a/tests/tests_dramsys/main.cpp b/tests/tests_dramsys/main.cpp new file mode 100644 index 00000000..1c92c82d --- /dev/null +++ b/tests/tests_dramsys/main.cpp @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2019, Technische Universität Kaiserslautern + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: + * Lukas Steiner + */ + +#include +#include + +int sc_main(int argc, char **argv) +{ + testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/tests/tests_dramsys/test_misc.cpp b/tests/tests_dramsys/test_misc.cpp index 5bca640d..165a3197 100644 --- a/tests/tests_dramsys/test_misc.cpp +++ b/tests/tests_dramsys/test_misc.cpp @@ -1,10 +1,5 @@ #include -int sc_main(int argc, char** argv) -{ - return -1; -}; - class MiscTest : public ::testing::Test { protected: virtual void SetUp() From a36ce91225f7a32fb1071090dd4e027ae68ddd4e Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Thu, 23 Mar 2023 10:52:32 +0100 Subject: [PATCH 2/3] Remove .a files from artifacts. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1cc3857..d9ed3594 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ build: - cmake --build build/coverage -j$(nproc) after_script: - find . -name "*.o" -type f -delete + - find . -name "*.a" -type f -delete artifacts: paths: - build/coverage From 5621bd41b469e485e4cbf40f86bbff2ea069b5cf Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Thu, 23 Mar 2023 11:14:52 +0100 Subject: [PATCH 3/3] Decrease artifacts expiration to 1 hour. --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9ed3594..326cde23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ build: artifacts: paths: - build/coverage - expire_in: 2 days + expire_in: 1 hour test: stage: test @@ -33,8 +33,7 @@ test: artifacts: paths: - build/coverage - expire_in: 2 days - + expire_in: 1 hour coverage: stage: coverage needs: @@ -44,4 +43,4 @@ coverage: artifacts: paths: - build/coverage/coverage_html - expire_in: 2 days + expire_in: 1 hour