Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI #88

Merged
merged 17 commits into from
Dec 3, 2022
Merged

Fix CI #88

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3dc3696
Set minimum CMake version from 3.11 to 3.16
SSBMTonberry Dec 3, 2022
2ecc685
CI: Set ubuntu version from latest to 20.04, and split ymls per build
SSBMTonberry Dec 3, 2022
27aa416
Disabled test that t6akes all systems at once
SSBMTonberry Dec 3, 2022
4b9f5b9
Tests now copies all maps to output dir, and now uses one path
SSBMTonberry Dec 3, 2022
1ea580a
See if windows-latest does any magic
SSBMTonberry Dec 3, 2022
dd7972a
Updated VS to 2019 and trying to add MacOS CI
SSBMTonberry Dec 3, 2022
e953da0
Using another component for clang on macos
SSBMTonberry Dec 3, 2022
a88e701
Renamed MacOS job to correct naming and removed c++experimental linking
SSBMTonberry Dec 3, 2022
73fe9f7
Added VS2022, using proper paths, and excluded libc++fs from macos
SSBMTonberry Dec 3, 2022
5be482b
Windows CI: CMake set to 3.21 to support VS2022 generator
SSBMTonberry Dec 3, 2022
8681c8e
Temporarily disabled compression tests for clang 10+, cmake v3.21 on all
SSBMTonberry Dec 3, 2022
3362026
Added badges + see if windows is happier without build folder.
SSBMTonberry Dec 3, 2022
b5f5ca7
Added file copy status message and reverted windows build folder remove
SSBMTonberry Dec 3, 2022
12cac1f
Main tests no longer accepts files that are not found!
SSBMTonberry Dec 3, 2022
168758b
Added an alternative way to set base path for files in tests
SSBMTonberry Dec 3, 2022
db4188c
Forgot fs alias and added better log when file not found.
SSBMTonberry Dec 3, 2022
44d352b
Added a stupid hack
SSBMTonberry Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Main tests no longer accepts files that are not found!
  • Loading branch information
@SSBMTonberry
SSBMTonberry committed Dec 3, 2022
commit 12cac1f3e6ab6ff50909b75465cc1fb5c173ee80
46 changes: 22 additions & 24 deletions tests/tests_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ TEST_CASE( "Nlohmann - Parse a whole map by file", "[complete][parse][file]" )
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand All @@ -245,8 +245,8 @@ TEST_CASE( "PicoJson - Parse a whole map by file", "[complete][parse][file]" )
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand Down Expand Up @@ -297,8 +297,8 @@ TEST_CASE( "Parse a whole map by file", "[complete][parse][file]" )
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand Down Expand Up @@ -329,8 +329,8 @@ TEST_CASE("Parse tileset properties", "[parse]")
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand Down Expand Up @@ -358,8 +358,8 @@ TEST_CASE( "Parse a Tiled v1.5 map with external tileset by file - Expect no err
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand Down Expand Up @@ -389,8 +389,8 @@ TEST_CASE( "Parse a Tiled v1.9 map with external tileset by file - Expect no err
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand All @@ -415,8 +415,8 @@ TEST_CASE( "Parse a whole COMPRESSED map by file", "[complete][parse][file][comp
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand Down Expand Up @@ -464,8 +464,8 @@ TEST_CASE( "Parse a whole map by file - minimal", "[complete][parse][file]" )
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand Down Expand Up @@ -551,8 +551,8 @@ TEST_CASE( "Parse map - expect correct flip flags", "[parse][file][flip]" )
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}
}

Expand All @@ -570,8 +570,8 @@ TEST_CASE( "Parse a whole map with base64 data by file", "[complete][parse][file
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}


Expand Down Expand Up @@ -640,7 +640,6 @@ TEST_CASE( "Parse a simple map by memory - tiles without any properties (issue #
else
{
std::cout << "Memory parse error - " << map->getStatusMessage() << std::endl;
//REQUIRE(true);
FAIL("Unexpected memory read failure!");
}
}
Expand All @@ -656,7 +655,6 @@ TEST_CASE( "Parse a minimal version of whole map by memory", "[complete][parse][
else
{
std::cout << "Memory parse error - " << map->getStatusMessage() << std::endl;
//REQUIRE(true);
FAIL("Unexpected memory read failure!");
}
}
Expand Down Expand Up @@ -698,8 +696,8 @@ TEST_CASE( "Parse map3.json - expect correct tileset data for all TileObjects",
}
else
{
std::cout << "Ignored - " << map->getStatusMessage() << std::endl;
REQUIRE(true);
std::cout << "Parsing failed! Base path: " << std::filesystem::current_path().generic_string() << "Status: " << map->getStatusMessage() << std::endl;
REQUIRE(false);
}

REQUIRE(numberOfEmptyTilesets == 0);
Expand Down