Browse Source

Merge pull request #1295 from zhibog/master

Add tests to Linux and Mac and add vendor tests
Jeroen van Rijn 3 years ago
parent
commit
989ddbd688
3 changed files with 37 additions and 6 deletions
  1. 26 4
      .github/workflows/ci.yml
  2. 5 2
      tests/core/Makefile
  3. 6 0
      tests/vendor/Makefile

+ 26 - 4
.github/workflows/ci.yml

@@ -6,8 +6,8 @@ jobs:
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
     steps:
       - uses: actions/checkout@v1
       - uses: actions/checkout@v1
-      - name: Download LLVM
-        run: sudo apt-get install llvm-11 clang-11 llvm
+      - name: Download LLVM, botan
+        run: sudo apt-get install llvm-11 clang-11 llvm libbotan-2-dev botan
       - name: build odin
       - name: build odin
         run: make release
         run: make release
       - name: Odin version
       - name: Odin version
@@ -30,13 +30,18 @@ jobs:
           cd tests/core
           cd tests/core
           make
           make
         timeout-minutes: 10
         timeout-minutes: 10
+      - name: Vendor library tests
+        run: |
+          cd tests/vendor
+          make
+        timeout-minutes: 10
   build_macOS:
   build_macOS:
     runs-on: macos-latest
     runs-on: macos-latest
     steps:
     steps:
       - uses: actions/checkout@v1
       - uses: actions/checkout@v1
-      - name: Download LLVM and setup PATH
+      - name: Download LLVM, botan and setup PATH
         run: |
         run: |
-          brew install llvm@11
+          brew install llvm@11 botan
           echo "/usr/local/opt/llvm@11/bin" >> $GITHUB_PATH
           echo "/usr/local/opt/llvm@11/bin" >> $GITHUB_PATH
           TMP_PATH=$(xcrun --show-sdk-path)/user/include
           TMP_PATH=$(xcrun --show-sdk-path)/user/include
           echo "CPATH=$TMP_PATH" >> $GITHUB_ENV
           echo "CPATH=$TMP_PATH" >> $GITHUB_ENV
@@ -57,6 +62,16 @@ jobs:
       - name: Odin run -debug
       - name: Odin run -debug
         run: ./odin run examples/demo/demo.odin -debug
         run: ./odin run examples/demo/demo.odin -debug
         timeout-minutes: 10
         timeout-minutes: 10
+      - name: Core library tests
+        run: |
+          cd tests/core
+          make
+        timeout-minutes: 10
+      - name: Vendor library tests
+        run: |
+          cd tests/vendor
+          make
+        timeout-minutes: 10
   build_windows:
   build_windows:
     runs-on: windows-latest
     runs-on: windows-latest
     steps:
     steps:
@@ -97,6 +112,13 @@ jobs:
           cd tests\core
           cd tests\core
           call build.bat
           call build.bat
         timeout-minutes: 10
         timeout-minutes: 10
+      - name: Vendor library tests
+        shell: cmd
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
+          cd tests\vendor
+          call build.bat
+        timeout-minutes: 10
       - name: core:math/big tests
       - name: core:math/big tests
         shell: cmd
         shell: cmd
         run: |
         run: |

+ 5 - 2
tests/core/Makefile

@@ -1,7 +1,7 @@
 ODIN=../../odin
 ODIN=../../odin
 PYTHON=$(shell which python3)
 PYTHON=$(shell which python3)
 
 
-all: download_test_assets image_test compress_test strings_test hash_test
+all: download_test_assets image_test compress_test strings_test hash_test crypto_test
 
 
 download_test_assets:
 download_test_assets:
 	$(PYTHON) download_assets.py
 	$(PYTHON) download_assets.py
@@ -16,4 +16,7 @@ strings_test:
 	$(ODIN) run strings/test_core_strings.odin
 	$(ODIN) run strings/test_core_strings.odin
 
 
 hash_test:
 hash_test:
-	$(ODIN) run hash -out=test_hash -o:speed -no-bounds-check
+	$(ODIN) run hash -out=test_hash -o:speed -no-bounds-check
+
+crypto_test:
+	$(ODIN) run crypto -out=crypto_hash -o:speed -no-bounds-check

+ 6 - 0
tests/vendor/Makefile

@@ -0,0 +1,6 @@
+ODIN=../../odin
+
+all: botan_test
+
+botan_test:
+	$(ODIN) run botan -out=botan_hash -o:speed -no-bounds-check