Merge pull request #178 from MikeMirzayanov/dev-mikemirzayanov

Fixed BOM issues, fixed tests and CI

.github/workflows/ci.yml

@@ -19,6 +19,7 @@ env:
 
 jobs:
   tests-ubuntu1804-gpp:
+    if: false # Disabled job
     strategy:
       matrix:
         os: [ubuntu-18.04]
@@ -34,6 +35,7 @@ jobs:
           bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
 
   tests-ubuntu1804-clang:
+    if: false # Disabled job
     strategy:
       matrix:
         os: [ubuntu-18.04]
@@ -79,6 +81,7 @@ jobs:
           bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
 
   tests-ubuntu1804-gpp-32:
+    if: false # Disabled job
     strategy:
       matrix:
         os: [ubuntu-18.04]
@@ -95,6 +98,7 @@ jobs:
           bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }} 32
 
   tests-ubuntu1804-clang-32:
+    if: false # Disabled job
     strategy:
       matrix:
         os: [ubuntu-18.04]
@@ -147,7 +151,7 @@ jobs:
       matrix:
         os: [macos-11]
         compiler: [g++]
-        version: [9, 10]
+        version: [10, 11, 12]
     name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -200,10 +204,10 @@ jobs:
           cd tests
           bash ./run.sh ${{ matrix.compiler }}
 
-  tests-windows:
+  tests-windows-2019:
     strategy:
       matrix:
-        os: [windows-2019, windows-2022]
+        os: [windows-2019]
         compiler: [msvc, g++, clang++]
     name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -213,3 +217,17 @@ jobs:
         run: |
           cd tests
           bash ./run.sh ${{ matrix.compiler }}
+
+  tests-windows-2022:
+    strategy:
+      matrix:
+        os: [windows-2022]
+        compiler: [msvc, g++]
+    name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run tests
+        run: |
+          cd tests
+          bash ./run.sh ${{ matrix.compiler }}

testlib.h

@@ -746,8 +746,8 @@ class random_t {
 
     /* Sets seed by given value. */
     void setSeed(long long _seed) {
-        _seed = (_seed ^ multiplier) & mask;
-        seed = _seed;
+        seed = (unsigned long long) _seed;
+        seed = (seed ^ multiplier) & mask;
     }
 
 #ifndef __BORLANDC__
@@ -3121,7 +3121,6 @@ void InStream::init(std::string fileName, TMode mode) {
     }
 
     reset();
-    skipBom();
 }
 
 void InStream::init(std::FILE *f, TMode mode) {
@@ -3137,7 +3136,6 @@ void InStream::init(std::FILE *f, TMode mode) {
         name = "stderr", stdfile = true;
 
     reset(f);
-    skipBom();
 }
 
 void InStream::skipBom() {
@@ -4628,6 +4626,7 @@ void registerTestlibCmd(int argc, char *argv[]) {
 
     inf.init(args[1], _input);
     ouf.init(args[2], _output);
+    ouf.skipBom();
     ans.init(args[3], _answer);
 }
 

tests/docker/clang-11/Dockerfile

@@ -0,0 +1,7 @@
+FROM silkeh/clang:11
+RUN apt-get update
+RUN apt-get install -y git default-jre
+COPY startup.sh /
+WORKDIR /
+RUN chmod +x /startup.sh
+CMD ["/bin/bash", "/startup.sh"]

tests/docker/clang-11/build.bat

@@ -0,0 +1,4 @@
+"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
+
+docker build . -t test-testlib-clang-11
+

tests/docker/clang-11/run.bat

@@ -0,0 +1,4 @@
+"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
+
+docker run -it test-testlib-clang-11
+

tests/docker/clang-11/startup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e -o pipefail
+
+git clone https://github.com/MikeMirzayanov/testlib.git
+cd testlib
+git checkout dev-mikemirzayanov
+cd tests
+./run.sh v0 11
+cd /
+rm -rf testlib

tests/docker/clang-latest/Dockerfile

@@ -0,0 +1,7 @@
+FROM silkeh/clang:latest
+RUN apt-get update
+RUN apt-get install -y git default-jre valgrind
+COPY startup.sh /
+WORKDIR /
+RUN chmod +x /startup.sh
+CMD ["/bin/bash", "/startup.sh"]

tests/docker/clang-latest/build.bat

@@ -0,0 +1,4 @@
+"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
+
+docker build . -t test-testlib-clang-latest
+

tests/docker/clang-latest/run.bat

@@ -0,0 +1,4 @@
+"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
+
+docker run -it test-testlib-clang-latest
+

tests/docker/clang-latest/startup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e -o pipefail
+
+git clone https://github.com/MikeMirzayanov/testlib.git
+cd testlib
+git checkout dev-mikemirzayanov
+cd tests
+./run.sh v0 23
+cd /
+rm -rf testlib

tests/docker/gcc-7/Dockerfile

@@ -0,0 +1,7 @@
+FROM gcc:7
+RUN apt-get update
+RUN apt-get install -y git default-jre valgrind
+COPY startup.sh /
+WORKDIR /
+RUN chmod +x /startup.sh
+CMD ["/bin/bash", "/startup.sh"]

tests/docker/gcc-7/build.bat

@@ -0,0 +1,4 @@
+"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
+
+docker build . -t test-testlib-gcc-7
+

tests/docker/gcc-7/run.bat

@@ -0,0 +1,4 @@
+"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
+
+docker run -it test-testlib-gcc-7
+

tests/docker/gcc-7/startup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e -o pipefail
+
+git clone https://github.com/MikeMirzayanov/testlib.git
+cd testlib
+git checkout dev-mikemirzayanov
+cd tests
+./run.sh g++ v0 11
+cd /
+rm -rf testlib

tests/docker/gcc-latest/Dockerfile

@@ -0,0 +1,7 @@
+FROM gcc:latest
+RUN apt-get update
+RUN apt-get install -y git default-jre valgrind
+COPY startup.sh /
+WORKDIR /
+RUN chmod +x /startup.sh
+CMD ["/bin/bash", "/startup.sh"]

tests/docker/gcc-latest/build.bat

@@ -0,0 +1,4 @@
+"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
+
+docker build . -t test-testlib-gcc-latest
+

tests/docker/gcc-latest/run.bat

@@ -0,0 +1,4 @@
+"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
+
+docker run -it test-testlib-gcc-latest
+

tests/docker/gcc-latest/startup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e -o pipefail
+
+git clone https://github.com/MikeMirzayanov/testlib.git
+cd testlib
+git checkout dev-mikemirzayanov
+cd tests
+./run.sh g++ v0 23
+cd /
+rm -rf testlib

tests/file-runner.py

@@ -0,0 +1,9 @@
+import subprocess
+import sys
+
+if len(sys.argv) > 1:
+    file_path = sys.argv[1]
+    subprocess.run([file_path])
+else:
+    print("Use python runner.py <file>")
+    sys.exit(1)