diff options
| author | Domen Kožar <domen@dev.si> | 2020-06-16 08:18:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 08:18:22 (GMT) |
| commit | 4dc6e9e3d5782dddfc42816081d4f37119c63a0f (patch) | |
| tree | 59ebc5102f6954ff7ff932d73e4418d5072ff740 | |
| parent | d9c9926f2409794af1c47ae1d987ad52d0172212 (diff) | |
| parent | 54efea9e696b9803d9d0e8f71436a01762f1c37c (diff) | |
| download | patchelf-4dc6e9e3d5782dddfc42816081d4f37119c63a0f.zip patchelf-4dc6e9e3d5782dddfc42816081d4f37119c63a0f.tar.gz patchelf-4dc6e9e3d5782dddfc42816081d4f37119c63a0f.tar.bz2 | |
Merge pull request #130 from am813nt/master
Fixed parallel execution of tests (parallel-tests in automake)
| -rw-r--r-- | configure.ac | 3 | ||||
| -rwxr-xr-x | tests/no-rpath-prebuild.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index e762e1e..80f82d7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,8 @@ +AC_PREREQ([2.62]) AC_INIT([patchelf], m4_esyscmd([printf $(cat ./version)])) AC_CONFIG_SRCDIR([src/patchelf.cc]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign color-tests serial-tests]) +AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror dist-bzip2 foreign color-tests parallel-tests]) AM_PROG_CC_C_O AC_PROG_CXX diff --git a/tests/no-rpath-prebuild.sh b/tests/no-rpath-prebuild.sh index aa27b7a..c58cf8e 100755 --- a/tests/no-rpath-prebuild.sh +++ b/tests/no-rpath-prebuild.sh @@ -4,7 +4,7 @@ ARCH="$1" PAGESIZE=4096 if [ -z "$ARCH" ]; then - ARCH=$(basename $0 .sh | sed -e 's/.*-//') + ARCH=$(basename $0 .sh | sed -e 's/^no-rpath-//') fi SCRATCH=scratch/no-rpath-$ARCH |