wip: windows

ArkScript-lang · Feb 21, 2024 · 679d938 · 679d938
1 parent 39da9c0
commit 679d938
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -187,13 +187,13 @@ jobs:
       - name: Setup tests
         uses: ./.github/workflows/setup-tests
 
-      - name: Unit tests
+      - name: C++ unit tests
         shell: bash
         run: |
           export ASAN_OPTIONS=detect_odr_violation=0
           ./unittests
 
-      - name: Unit tests
+      - name: ArkScript unit tests
         shell: bash
         run: |
           export ASAN_OPTIONS=detect_odr_violation=0

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -181,6 +181,7 @@ if (ARK_TESTS)
 
     add_compile_definitions(BOOST_UT_DISABLE_MODULE)
     target_compile_features(unittests PRIVATE cxx_std_20)
+    target_compile_definitions(unittests PRIVATE ARK_TESTS_ROOT="${CMAKE_CURRENT_SOURCE_DIR}/")
 endif()
 
 if (ARK_BUILD_EXE)

diff --git a/tests/unittests/ASTSuite.cpp b/tests/unittests/ASTSuite.cpp
@@ -13,25 +13,26 @@ ut::suite<"AST"> ast_suite = [] {
     using namespace ut;
 
     "[generate valid ast]"_test = [] {
-        for (const auto& entry : fs::directory_iterator("tests/unittests/resources/ASTSuite"))
+        for (const auto& entry : fs::directory_iterator(ARK_TESTS_ROOT "tests/unittests/resources/ASTSuite"))
         {
             if (entry.path().extension() != ".ark")
                 continue;
 
-            std::string path = entry.path().string();
-            std::string stem = entry.path().stem().string();
+            std::string path = entry.path().generic_string();
+            std::string stem = entry.path().stem().generic_string();
             fs::path expected_path = entry.path();
             expected_path.replace_extension("json");
 
-            Ark::JsonCompiler compiler(false, { "lib/std/" });
+            Ark::JsonCompiler compiler(false, { ARK_TESTS_ROOT "lib/std/" });
 
-            should("parse " + stem + " and generate a valid AST") = [&] {
+            std::string test_name = "parse " + stem + " and generate a valid AST";
+            should(std::string_view(test_name)) = [&] {
                 expect(nothrow([&] {
                     mut(compiler).feed(path);
                 }));
 
                 std::string json = compiler.compile();
-                std::string expected = Ark::Utils::readFile(expected_path.string());
+                std::string expected = Ark::Utils::readFile(expected_path.generic_string());
                 expect(that % json == expected);
             };
         }

diff --git a/tests/unittests/ParserSuite.cpp b/tests/unittests/ParserSuite.cpp
@@ -6,6 +6,7 @@
 #include <termcolor/proxy.hpp>
 
 #include <sstream>
+#include <algorithm>
 #include <filesystem>
 
 namespace fs = std::filesystem;
@@ -48,15 +49,15 @@ ut::suite<"Parser"> parser_suite = [] {
     using namespace ut;
 
     "[successful parsing]"_test = [] {
-        for (const auto& entry : fs::directory_iterator("tests/unittests/resources/ParserSuite/success"))
+        for (const auto& entry : fs::directory_iterator(ARK_TESTS_ROOT "tests/unittests/resources/ParserSuite/success"))
         {
             if (entry.path().extension() != ".ark")
                 continue;
 
             Ark::internal::Parser parser;
 
-            std::string path = entry.path().string();
-            std::string stem = entry.path().stem().string();
+            std::string path = entry.path().generic_string();
+            std::string stem = entry.path().stem().generic_string();
             fs::path expected_path = entry.path();
             expected_path.replace_extension("expected");
 
@@ -69,22 +70,25 @@ ut::suite<"Parser"> parser_suite = [] {
             // expect(that % parser.ast().constList().size() >= 1_u);
             std::string ast = astToString(parser);
 
-            should("output the same AST and imports (" + stem + ")") = [&] {
-                expect(that % ast == Ark::Utils::readFile(expected_path.string()));
+            std::string test_name = "output the same AST and imports (" + stem + ")";
+            should(std::string_view(test_name)) = [&] {
+                std::string file = Ark::Utils::readFile(expected_path.generic_string());
+                file.erase(std::remove(file.begin(), file.end(), '\r'), file.end());
+                expect(that % ast == file);
             };
         }
     };
 
     "[error reporting]"_test = [] {
-        for (const auto& entry : fs::directory_iterator("tests/unittests/resources/ParserSuite/failure"))
+        for (const auto& entry : fs::directory_iterator(ARK_TESTS_ROOT "tests/unittests/resources/ParserSuite/failure"))
         {
             if (entry.path().extension() != ".ark")
                 continue;
 
             Ark::internal::Parser parser;
 
-            std::string path = entry.path().string();
-            std::string stem = entry.path().stem().string();
+            std::string path = entry.path().generic_string();
+            std::string stem = entry.path().stem().generic_string();
             fs::path expected_path = entry.path();
             expected_path.replace_extension("expected");
 
@@ -98,8 +102,16 @@ ut::suite<"Parser"> parser_suite = [] {
                 ss << termcolor::nocolorize;
                 Ark::Diagnostics::generate(e, "", ss);
 
-                should("output the same error message (" + stem + ")") = [&] {
-                    expect(that % ss.str() == Ark::Utils::readFile(expected_path.string()));
+                std::string test_name = "output the same error message (" + stem + ")";
+                should(std::string_view(test_name)) = [&] {
+                    std::string file = Ark::Utils::readFile(expected_path.generic_string());
+                    file.erase(std::remove(file.begin(), file.end(), '\r'), file.end());
+
+                    std::string tested = ss.str();
+                    tested.erase(std::remove(tested.begin(), tested.end(), '\r'), tested.end());
+                    tested.erase(tested.find(ARK_TESTS_ROOT), std::size(ARK_TESTS_ROOT) - 1);
+
+                    expect(that % tested == file);
                 };
             }
             catch (...)