tests/tap/Makefile \
tests/auth/Makefile \
tests/cmd/Makefile \
+ tests/common/Makefile \
tests/util/Makefile \
src/helper-splint.sh
if test -d doc/man-pages ; then \
tests/Makefile \
tests/auth/Makefile \
tests/cmd/Makefile \
+tests/common/Makefile \
tests/rpctestlib/Makefile \
tests/tap/Makefile \
tests/util/Makefile,
MODULE_CFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \
-DBUILD='"$(abs_top_builddir)/tests"'
-SUBDIRS = tap auth util cmd
+SUBDIRS = tap common auth util cmd
all: runtests
@for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done
TESTS = authcon-t superuser-t keys-t
-MODULE_CFLAGS=-I$(srcdir)/..
+MODULE_CFLAGS=-I$(srcdir)/.. -I$(srcdir)/../common/
all check test tests: $(TESTS)
$(LIB_rfc3961) $(LIB_roken) -lafsutil\
$(XLIBS)
-authcon-t: authcon-t.o common.o
- $(AFS_LDRULE) authcon-t.o common.o \
+authcon-t: authcon-t.o ../common/config.o
+ $(AFS_LDRULE) authcon-t.o ../common/config.o \
$(MODULE_LIBS)
-superuser-t: superuser-t.o common.o test.cs.o test.ss.o test.xdr.o
- $(AFS_LDRULE) superuser-t.o common.o \
+superuser-t: superuser-t.o ../common/config.o test.cs.o test.ss.o test.xdr.o
+ $(AFS_LDRULE) superuser-t.o ../common/config.o \
test.cs.o test.ss.o test.xdr.o \
$(MODULE_LIBS)
-keys-t: keys-t.o common.o
- $(AFS_LDRULE) keys-t.o common.o $(MODULE_LIBS)
+keys-t: keys-t.o ../common/config.o
+ $(AFS_LDRULE) keys-t.o ../common/config.o $(MODULE_LIBS)
writekeyfile: writekeyfile.o
$(AFS_LDRULE) writekeyfile.o $(MODULE_LIBS)
test.h: test.xg
$(RXGEN) -A -x -h -o $@ $(srcdir)/test.xg
-superuser-t.o: test.h common.h
+superuser-t.o: test.h
clean:
rm -f *.o *.cs.c *.ss.c *.xdr.c test.h \
struct afsconf_typedKey *key;
plan(9);
- dirname = buildTestConfig();
+ dirname = afstest_BuildTestConfig();
dir = afsconf_Open(dirname);
if (dir == NULL) {
/* Create a temporary afs configuration directory */
- dirname = buildTestConfig();
+ dirname = afstest_BuildTestConfig();
if (asprintf(&keyfile, "%s/KeyFile", dirname) == -1)
goto out;
afsconf_Close(dir);
- unlinkTestConfig(dirname);
+ afstest_UnlinkTestConfig(dirname);
free(dirname);
free(keyfile);
/* Start a new test configuration */
- dirname = buildTestConfig();
+ dirname = afstest_BuildTestConfig();
dir = afsconf_Open(dirname);
ok(dir != NULL, "Sucessfully opened brand new config directory");
if (dir == NULL)
" ... with the right key");
out:
- unlinkTestConfig(dirname);
+ afstest_UnlinkTestConfig(dirname);
return 0;
}
/* Otherwise, do the basic configuration, then start the client and
* server */
- dirname = buildTestConfig();
+ dirname = afstest_BuildTestConfig();
dir = afsconf_Open(dirname);
if (dir == NULL) {
--- /dev/null
+
+srcdir=@srcdir@
+abs_top_builddir=@abs_top_builddir@
+include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.pthread
+
+MODULE_CFLAGS=-I$(srcdir)/..
+
+all check test tests: config.o
+
+clean:
+ rm -f *.o
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-extern char *buildTestConfig(void);
-extern void unlinkTestConfig(char *);
+extern char *afstest_BuildTestConfig(void);
+extern void afstest_UnlinkTestConfig(char *);
*/
char *
-buildTestConfig(void) {
+afstest_BuildTestConfig(void) {
char *dir = NULL;
FILE *file;
*/
void
-unlinkTestConfig(char *dir)
+afstest_UnlinkTestConfig(char *dir)
{
unlinkConfigFile(dir, "KeyFile");
unlinkConfigFile(dir, "CellServDB");