Skip to content

Commit

Permalink
Fix check to use the proper version + inline it into buildenv
Browse files Browse the repository at this point in the history
  • Loading branch information
IgorTodorovskiIBM committed May 18, 2023
1 parent d4b328c commit 3ecfd07
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 8 additions & 2 deletions buildenv
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
# Set up environment variables for general build tool to operate
#
export ZOPEN_TYPE="TARBALL"
MAKE_VERSION="4.4.1"

export ZOPEN_TARBALL_URL="https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz"
export ZOPEN_TARBALL_URL="https://ftp.gnu.org/gnu/make/make-$MAKE_VERSION.tar.gz"
export ZOPEN_TARBALL_DEPS="curl gzip tar m4 perl make zoslib"

export ZOPEN_GIT_URL="https://git.savannah.gnu.org/git/make.git"
export ZOPEN_GIT_DEPS="git make m4 perl autoconf automake help2man texinfo xz"
export ZOPEN_CHECK="${ZOPEN_ROOT}/makecheck.sh"
export ZOPEN_CHECK="check_make"
export ZOPEN_INSTALL="install_make"
export ZOPEN_COMP=CLANG

Expand All @@ -18,6 +19,11 @@ install_make()
./make install "$@"
}

check_make()
{
(cd "${ZOPEN_ROOT}/make-$MAKE_VERSION/tests" && perl ./run_make_tests.pl -srcdir ../ -make ../make 2>&1)
}

zopen_check_results()
{
chk="$1/$2_check.log"
Expand Down
2 changes: 0 additions & 2 deletions makecheck.sh

This file was deleted.

0 comments on commit 3ecfd07

Please sign in to comment.