From 7e90537379b6ec92cf0fe4d26f713a1c64717d27 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Wed, 19 Feb 2025 13:58:52 +0100 Subject: [PATCH] For run of test using bash in makefile --- Makefile | 2 +- obitests/obitools/obicount/test.sh | 2 +- pkg/obioptions/version.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 28fcf74..2219057 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ test: obitests: obitools for t in $$(find obitests -name test.sh -print) ; do \ - $(SHELL) $${t} ; \ + bash $${t} ; \ done man: diff --git a/obitests/obitools/obicount/test.sh b/obitests/obitools/obicount/test.sh index 22a05d5..53f86bf 100755 --- a/obitests/obitools/obicount/test.sh +++ b/obitests/obitools/obicount/test.sh @@ -11,7 +11,7 @@ TEST_NAME=obicount # ###### TEST_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -OBITOOLS_DIR="$(sed 's/obitest.*//' <<< "$TEST_DIR")build" +OBITOOLS_DIR="${TEST_DIR/obitest*/}build" export PATH="${OBITOOLS_DIR}:${PATH}" diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go index 906f3f8..b5d16ab 100644 --- a/pkg/obioptions/version.go +++ b/pkg/obioptions/version.go @@ -8,7 +8,7 @@ import ( // corresponds to the last commit, and not the one when the file will be // commited -var _Commit = "bd4a0b5" +var _Commit = "d3d15ac" var _Version = "Release 4.2.0" // Version returns the version of the obitools package.