From bcc9df928a17e22e3c2964c969a507661a543a00 Mon Sep 17 00:00:00 2001 From: Ratstail91 Date: Mon, 28 Aug 2023 21:38:40 +1000 Subject: [PATCH] Investigating mingw behaviour --- .github/workflows/c-cpp.yml | 2 +- test/scripts/lib/fileio.toy | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index b64ee92..cdff8ea 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -2,7 +2,7 @@ name: Comprehensive Tests on: push: - branches: [ "main", "dev" ] + branches: [ "main", "*" ] pull_request: branches: [ "main" ] diff --git a/test/scripts/lib/fileio.toy b/test/scripts/lib/fileio.toy index 47ee137..896716d 100644 --- a/test/scripts/lib/fileio.toy +++ b/test/scripts/lib/fileio.toy @@ -116,22 +116,22 @@ fn reset() { assert reader.seek("bgn", 6) == true, "seek from bgn failed"; var contents = reader.read(string); - assert contents == " World!\n", "seek failed to move file position"; + assert contents == " World!\n", "seek failed to move file position (1st)"; assert reader.seek("end", -2) == true, "seek from end failed"; contents = reader.read(string); - assert contents == "!\n", "seek failed to move file position"; + assert (contents == "!\n" || contents == "\r\n"), "seek failed to move file position (2nd)"; assert reader.seek("cur", -2) == true, "seek from cur failed"; contents = reader.read(string); - assert contents == "!\n", "seek failed to move file position"; + assert (contents == "!\n" || contents == "\r\n"), "seek failed to move file position (3rd)"; - assert reader.seek("CUR", 0) == false, "seek origin failed"; - assert reader.seek("End", 0) == false, "seek origin failed"; - assert reader.seek("beG", 0) == false, "seek origin failed"; - assert reader.seek("xxx", 0) == false, "seek origin failed"; + assert reader.seek("CUR", 0) == false, "seek origin failed (1st)"; + assert reader.seek("End", 0) == false, "seek origin failed (2nd)"; + assert reader.seek("beG", 0) == false, "seek origin failed (3rd)"; + assert reader.seek("xxx", 0) == false, "seek origin failed (4th)"; reader.close(); }