From a06fa39a5d94cb6b59dbfd3ee077f1d0132dfbc8 Mon Sep 17 00:00:00 2001 From: Xiphoseer Date: Mon, 3 Jan 2022 16:30:29 +0100 Subject: [PATCH] Add newline at EOF; re-merge cmake steps --- .github/workflows/build-and-test.yml | 8 +------- tests/CommonCxxTests.h | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index cd763ca7..1f4d0dca 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -15,17 +15,11 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: cmake-configure + - name: cmake uses: lukka/run-cmake@v10 with: configurePreset: 'default' - - name: cmake-build - uses: lukka/run-cmake@v10 - with: buildPreset: 'default' - - name: cmake-test - uses: lukka/run-cmake@v10 - with: testPreset: 'default' - name: artifacts uses: actions/upload-artifact@v2 diff --git a/tests/CommonCxxTests.h b/tests/CommonCxxTests.h index 8d2dbbab..f1894927 100644 --- a/tests/CommonCxxTests.h +++ b/tests/CommonCxxTests.h @@ -1,4 +1,4 @@ #include #define ASSERT_EQ(a,b) { if (!(a == b)) { printf("Failed assertion: " #a " == " #b " \n in %s:%d\n", __FILE__, __LINE__); return 1; }} -#define ASSERT_NE(a,b) { if (!(a != b)) { printf("Failed assertion: " #a " != " #b " \n in %s:%d\n", __FILE__, __LINE__); return 1; }} \ No newline at end of file +#define ASSERT_NE(a,b) { if (!(a != b)) { printf("Failed assertion: " #a " != " #b " \n in %s:%d\n", __FILE__, __LINE__); return 1; }}