Skip to content

Commit 1991052

Browse files
committed
contrib/ci.inria.fr: pass some configure options from slave-specific envvars
Signed-off-by: Brice Goglin <[email protected]>
1 parent 8fdd0aa commit 1991052

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

contrib/ci.inria.fr/job-1-check.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright © 2012-2018 Inria. All rights reserved.
3+
# Copyright © 2012-2020 Inria. All rights reserved.
44
# See COPYING in top-level directory.
55
#
66

@@ -30,7 +30,7 @@ touch configure
3030
# build without plugins, with relative VPATH
3131
mkdir build
3232
cd build
33-
../configure
33+
../configure $HWLOC_CI_JOB1CHECK_CONFOPTS
3434
make
3535
make check
3636
utils/lstopo/lstopo-no-graphics -v
@@ -39,7 +39,7 @@ cd ..
3939
# build with plugins, with absolute VPATH
4040
mkdir build-plugins
4141
cd build-plugins
42-
$PWD/../configure --enable-plugins
42+
$PWD/../configure --enable-plugins $HWLOC_CI_JOB1CHECK_CONFOPTS
4343
make
4444
make check
4545
tests/hwloc/wrapper.sh utils/lstopo/lstopo-no-graphics -v

contrib/ci.inria.fr/job-3-debug.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright © 2012-2018 Inria. All rights reserved.
3+
# Copyright © 2012-2020 Inria. All rights reserved.
44
# See COPYING in top-level directory.
55
#
66

@@ -30,7 +30,7 @@ touch configure
3030
# build with plugins and debug
3131
mkdir build-plugins-debug
3232
cd build-plugins-debug
33-
../configure --enable-plugins --enable-debug
33+
../configure --enable-plugins --enable-debug $HWLOC_CI_JOB3DEBUG_CONFOPTS
3434
make
3535
make check
3636
tests/hwloc/wrapper.sh utils/lstopo/lstopo-no-graphics

0 commit comments

Comments
 (0)