Skip to content

Commit

Permalink
Merge pull request #416 from jougs/simplified-travis
Browse files Browse the repository at this point in the history
Actually use the configure flags for ltdl and readline
  • Loading branch information
heplesser committed Jul 1, 2016
2 parents 8de7b59 + 556528d commit c4c637c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 2 additions & 0 deletions build.sh
Expand Up @@ -255,6 +255,8 @@ cmake \
$CONFIGURE_MPI \
$CONFIGURE_PYTHON \
$CONFIGURE_GSL \
$CONFIGURE_LTDL \
$CONFIGURE_READLINE \
..
echo "======= Configure NEST end ======="

Expand Down
10 changes: 9 additions & 1 deletion testsuite/regressiontests/ticket-787.sli
Expand Up @@ -56,7 +56,14 @@ statusdict/is_mpi :: {statusdict/exitcodes/success :: quit_i} if
% entries to skip

% functions that confuse the test setup
/special_skip [/abort /license /helpindex /helpdesk] def
/special_skip [/abort /license /helpindex /helpdesk /help /help_any] def

% functions that depend on readline and should not be checked if
% NEST was compiled without support for the GNU readline library
/readline_skip [] def
systemdict /GNUReadline known not {
/readline_skip [/executive /mathexecutive /GNUreadline /break] def
} if

% private functions not expected to implement full error checking
/private_skip [
Expand Down Expand Up @@ -135,6 +142,7 @@ statusdict/is_mpi :: {statusdict/exitcodes/success :: quit_i} if
k cvs -1 Take (_) neq and
private_skip k MemberQ not and
special_skip k MemberQ not and
readline_skip k MemberQ not and
} Select
def

Expand Down

0 comments on commit c4c637c

Please sign in to comment.