Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MUSIC
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mikael Djurfeldt
MUSIC
Commits
48021352
Commit
48021352
authored
5 years ago
by
Mikael Djurfeldt
Browse files
Options
Downloads
Patches
Plain Diff
Bugfixes in music_tests
parent
8e124ec0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+33
-7
33 additions, 7 deletions
configure.ac
testsuite/music_tests.in
+7
-7
7 additions, 7 deletions
testsuite/music_tests.in
with
40 additions
and
14 deletions
configure.ac
+
33
−
7
View file @
48021352
...
@@ -294,17 +294,42 @@ else
...
@@ -294,17 +294,42 @@ else
MUSIC_HAVE_MPI_COMM_CREATE_ERRHANDLER=0
MUSIC_HAVE_MPI_COMM_CREATE_ERRHANDLER=0
fi
fi
if test "$prefix" = NONE; then
# Pre-evaluating some autoconf variables
PKGDATADIR=`eval echo $ac_default_prefix/share/$PACKAGE-$PACKAGE_VERSION`
if test "x$prefix" = xNONE; then
PREFIX=$ac_default_prefix
prefix=$PREFIX
else
else
PKGDATADIR=`eval echo $prefix/share/$PACKAGE-$PACKAGE_VERSION`
PREFIX="$prefix"
fi
fi
if test "x$exec_prefix" = xNONE; then
if test "$prefix" = NONE; then
EXEC_PREFIX="$PREFIX"
PKGEXTRABINDIR=`eval echo $ac_default_prefix/lib/$PACKAGE-$PACKAGE_VERSION`
exec_prefix=$EXEC_PREFIX
else
EXEC_PREFIX="`eval echo $exec_prefix`"
fi
if test "x$bindir" = 'x${exec_prefix}/bin'; then
BINDIR="$EXEC_PREFIX/bin"
else
BINDIR="`eval echo $bindir`"
fi
if test "x$libdir" = 'x${exec_prefix}/lib'; then
LIBDIR="$EXEC_PREFIX/lib"
else
else
PKGEXTRABIN
DIR=`eval echo $
prefix/lib/$PACKAGE-$PACKAGE_VERSION`
LIB
DIR=
"
`eval echo $
libdir`"
fi
fi
if test "x$datarootdir" = 'x${prefix}/share'; then
DATAROOTDIR="$PREFIX/share"
else
DATAROOTDIR="`eval echo $datarootdir`"
fi
if test "x$datadir" = 'x${datarootdir}'; then
DATADIR="$DATAROOTDIR"
else
DATADIR="`eval echo $datadir`"
fi
PKGDATADIR="$DATADIR/$PACKAGE-$PACKAGE_VERSION"
PKGEXTRABINDIR="$LIBDIR/$PACKAGE-$PACKAGE_VERSION"
#TEST_SH_LIST=${srcdir}/*.test
#TEST_SH_LIST=${srcdir}/*.test
...
@@ -393,6 +418,7 @@ AC_SUBST(OPTIONAL_UTILS)
...
@@ -393,6 +418,7 @@ AC_SUBST(OPTIONAL_UTILS)
AC_SUBST(TESTDIR)
AC_SUBST(TESTDIR)
AC_SUBST(EXAMPLESDIR)
AC_SUBST(EXAMPLESDIR)
AC_SUBST(EXTRAS)
AC_SUBST(EXTRAS)
AC_SUBST(BINDIR)
AC_SUBST(PKGDATADIR)
AC_SUBST(PKGDATADIR)
AC_SUBST(PKGEXTRABINDIR)
AC_SUBST(PKGEXTRABINDIR)
AC_SUBST(LAUNCHSTYLE)
AC_SUBST(LAUNCHSTYLE)
...
...
This diff is collapsed.
Click to expand it.
testsuite/music_tests.in
+
7
−
7
View file @
48021352
#!/bin/sh
#!/bin/sh
#
#
# This script runs all tests that are located in the testsuite directory
# This script runs all tests that are located in the
MUSIC
testsuite directory
#
#
usage
()
usage
()
...
@@ -10,7 +10,7 @@ usage ()
...
@@ -10,7 +10,7 @@ usage ()
fi
fi
cat
<<
EOF
cat
<<
EOF
Usage: music_tests
.sh
[options ...]
Usage: music_tests [options ...]
Options:
Options:
...
@@ -169,14 +169,14 @@ run_test()
...
@@ -169,14 +169,14 @@ run_test()
echo
"#!/bin/sh"
>
"
${
TEST_RUNFILE
}
"
echo
"#!/bin/sh"
>
"
${
TEST_RUNFILE
}
"
echo
"set +e"
>>
"
${
TEST_RUNFILE
}
"
echo
"set +e"
>>
"
${
TEST_RUNFILE
}
"
command
=
"
'
${
TEST_BASEDIR
}
/
${
test_name
}
'
>
'
${
TEST_OUTFILE
}
'
2>&1"
command
=
"
${
TEST_BASEDIR
}
/
${
test_name
}
>
${
TEST_OUTFILE
}
2>&1"
echo
"
${
command
}
"
>>
"
${
TEST_RUNFILE
}
"
echo
"
${
command
}
"
>>
"
${
TEST_RUNFILE
}
"
echo
"echo
\$
? >
'
${
TEST_RETFILE
}
'
; exit 0"
>>
"
${
TEST_RUNFILE
}
"
echo
"echo
\$
? >
${
TEST_RETFILE
}
; exit 0"
>>
"
${
TEST_RUNFILE
}
"
chmod
755
"
${
TEST_RUNFILE
}
"
chmod
755
"
${
TEST_RUNFILE
}
"
time_dirty
=
"
$(
/bin/sh
-c
"time
${
TIME_PARAM
}
'
${
TEST_RUNFILE
}
'
"
2>&1
)
"
time_dirty
=
"
$(
/bin/
ba
sh
-c
"time
${
TIME_PARAM
}
${
TEST_RUNFILE
}
"
2>&1
)
"
rm
-f
"
${
TEST_RUNFILE
}
"
rm
-f
"
${
TEST_RUNFILE
}
"
TIME_ELAPSED
=
"
$(
echo
"
${
time_dirty
}
"
|
awk
'NR == 1 { print $2 ; }'
)
"
TIME_ELAPSED
=
"
$(
echo
"
${
time_dirty
}
"
|
awk
'NR == 1 { print $2 ; }'
)
"
...
@@ -313,7 +313,7 @@ done
...
@@ -313,7 +313,7 @@ done
TEST_BASEDIR
=
"@PKGDATADIR@/tests"
TEST_BASEDIR
=
"@PKGDATADIR@/tests"
echo
>>
"
${
TEST_LOGFILE
}
"
"Running tests from
${
TEST_BASEDIR
}
"
echo
>>
"
${
TEST_LOGFILE
}
"
"Running tests from
${
TEST_BASEDIR
}
"
TEST_BINDIR
=
"@
prefix@/@bindir
@"
TEST_BINDIR
=
"@
BINDIR
@"
export
TEST_BINDIR
export
TEST_BINDIR
TEST_EXTRABINDIR
=
"@PKGEXTRABINDIR@"
TEST_EXTRABINDIR
=
"@PKGEXTRABINDIR@"
...
@@ -322,7 +322,7 @@ export TEST_EXTRABINDIR
...
@@ -322,7 +322,7 @@ export TEST_EXTRABINDIR
CMP
=
"
${
CMP
-cmp
}
"
CMP
=
"
${
CMP
-cmp
}
"
export
CMP
export
CMP
MUSIC_BINARY
=
"@
prefix@/@bindir@/MUSIC
"
MUSIC_BINARY
=
"@
BINDIR@/musicrun
"
export
MUSIC_BINARY
export
MUSIC_BINARY
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment