Skip to content

Commit 1867f86

Browse files
committed
Fix make distcheck
Signed-off-by: Simo Sorce <[email protected]>
1 parent 3718f86 commit 1867f86

File tree

5 files changed

+23
-6
lines changed

5 files changed

+23
-6
lines changed

Makefile.am

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ check_PROGRAMS = \
4848
gssntlmssp_LTLIBRARIES = \
4949
gssntlmssp.la
5050

51-
dist_noinst_SCRIPTS = tests/scripts/dlopen.sh
51+
dist_noinst_SCRIPTS = \
52+
tests/scripts/dlopen.sh \
53+
tests/env1.sh \
54+
tests/env2.sh
5255

5356
dist_noinst_DATA =
5457

@@ -70,8 +73,6 @@ AM_CPPFLAGS = \
7073
-DSYSCONFDIR=\"$(sysconfdir)\" \
7174
-DLOCALEDIR=\"$(localedir)\"
7275

73-
#EXTRA_DIST = build/config.rpath
74-
7576
GN_MECHGLUE_LIBS = $(GSSAPI_LIBS) $(CRYPTO_LIBS) $(WBC_LIBS)
7677

7778
GN_MECHGLUE_OBJ = \
@@ -222,7 +223,15 @@ endif
222223
# Testing #
223224
####################
224225

226+
EXTRA_DIST = \
227+
examples/test_user_file.txt \
228+
examples/test_user_file2.txt \
229+
examples/test_user_file3.txt
230+
225231
TESTS = ntlmssptest tests/env1.sh tests/env2.sh
226232

227233
test_gssntlmssp:
228234
TMPDIR=tests/scripts/ ./tests/scripts/dlopen.sh ./.libs/gssntlmssp.so || exit 1
235+
236+
distclean-local:
237+
rm -f tests-trace.log

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ abs_build_dir=`pwd`
136136
AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the build directory])
137137
AC_SUBST([abs_builddir], $abs_build_dir)
138138

139+
abs_src_dir=`cd $srcdir && pwd`
140+
AC_DEFINE_UNQUOTED([ABS_SRC_DIR], ["$abs_src_dir"], [Absolute path to the source directory])
141+
AC_SUBST([abs_srcdir], $abs_src_dir)
142+
139143
AC_CONFIG_FILES([Makefile man/Makefile po/Makefile
140144
contrib/gssntlmssp.spec examples/mech.ntlmssp])
141145
AC_OUTPUT

tests/env1.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

3-
export NTLM_USER_FILE="examples/test_user_file2.txt"
3+
EXAMPLES=$(dirname "$0")/../examples
4+
5+
export NTLM_USER_FILE="${EXAMPLES}/test_user_file2.txt"
46
export TEST_USER_NAME="testuser"
57
./ntlmssptest

tests/env2.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

3-
export NTLM_USER_FILE="examples/test_user_file3.txt"
3+
EXAMPLES=$(dirname "$0")/../examples
4+
5+
export NTLM_USER_FILE="${EXAMPLES}/test_user_file3.txt"
46
export TEST_USER_NAME="TESTDOM\\testuser"
57
./ntlmssptest

tests/ntlmssptest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ int test_GSS_Wrap_EX(struct ntlm_ctx *ctx, struct t_gsswrapex_data *data)
13381338
return ret;
13391339
}
13401340

1341-
#define TEST_USER_FILE "examples/test_user_file.txt"
1341+
#define TEST_USER_FILE ABS_SRC_DIR"/examples/test_user_file.txt"
13421342

13431343
long seed = 0;
13441344
static size_t repeatable_rand(uint8_t *buf, size_t max)

0 commit comments

Comments
 (0)