Parcourir la source

Merge pull request #3683 from andreas-jonsson/test-make-cleanup

Minor cleanup of makefiles and scripts
gingerBill il y a 1 an
Parent
commit
76d3be7912
3 fichiers modifiés avec 7 ajouts et 6 suppressions
  1. 0 1
      .github/workflows/ci.yml
  2. 6 4
      tests/internal/Makefile
  3. 1 1
      tests/issues/run.sh

+ 0 - 1
.github/workflows/ci.yml

@@ -24,7 +24,6 @@ jobs:
           /usr/sbin/pkg_add https://github.com/andreas-jonsson/llvm17-netbsd-bin/releases/download/pkgsrc-current/llvm-17.0.6.tgz
           /usr/sbin/pkg_add https://github.com/andreas-jonsson/llvm17-netbsd-bin/releases/download/pkgsrc-current/clang-17.0.6.tgz
           ln -s /usr/pkg/bin/python3.11 /usr/bin/python3
-          ln -s /usr/pkg/bin/bash /bin/bash
         run: |
           git config --global --add safe.directory $(pwd)
           gmake release

+ 6 - 4
tests/internal/Makefile

@@ -1,7 +1,9 @@
 ODIN=../../odin
 COMMON=-file -vet -strict-style -o:minimal
 
-all: asan_test rtti_test map_test pow_test 128_test string_compare_test
+all: all_bsd asan_test
+
+all_bsd: rtti_test map_test pow_test 128_test string_compare_test
 
 rtti_test:
 	$(ODIN) test test_rtti.odin $(COMMON)
@@ -15,8 +17,8 @@ pow_test:
 128_test:
 	$(ODIN) test test_128.odin $(COMMON)
 
+string_compare_test:
+	$(ODIN) test test_string_compare.odin $(COMMON)
+
 asan_test:
 	$(ODIN) test test_asan.odin $(COMMON) -sanitize:address -debug
-
-string_compare_test:
-	$(ODIN) test test_string_compare.odin $(COMMON)

+ 1 - 1
tests/issues/run.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eu
 
 mkdir -p build