Skip to content

Commit 9eca41e

Browse files
committed
Use top_srcdir in tests/DS/sds_detect_version.
1 parent c125327 commit 9eca41e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

tests/DS/sds_detect_version/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CLEANFILES = *.log *.results oscap_debug.log.*
33

44
TESTS_ENVIRONMENT= \
55
builddir=$(top_builddir) \
6-
srcdir=$(top_srcdir) \
6+
top_srcdir=$(top_srcdir) \
77
OSCAP_FULL_VALIDATION=1 \
88
$(top_builddir)/run
99

tests/DS/sds_detect_version/test_detect_version.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212

1313
set -e -o pipefail
1414

15+
echo $srcdir
16+
1517
function test_oscap_info {
1618
version="$1"
1719
stdout="$(mktemp)"
1820
stderr="$(mktemp)"
1921
ds="$(mktemp)"
20-
cp scap-ds.xml $ds
22+
cp $srcdir/scap-ds.xml $ds
2123
sed -i "s/X.X/${version}/g" $ds
2224

2325
$OSCAP info $ds > $stdout 2> $stderr
@@ -28,7 +30,7 @@ function test_oscap_info {
2830
rm $ds
2931
}
3032

31-
SDS=$(find $srcdir/schemas/sds -maxdepth 1 -mindepth 1 -type d -printf '%f\n')
33+
SDS=$(find $top_srcdir/schemas/sds -maxdepth 1 -mindepth 1 -type d -printf '%f\n')
3234

3335
for sds_version in $SDS
3436
do

0 commit comments

Comments
 (0)