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) {
+++ /dev/null
-/*
- * Copyright (c) 2010 Your File System Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*!
- * Common functions for building a configuration directory
- */
-
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
-#include <afs/afsutil.h>
-
-#include "common.h"
-
-static FILE *
-openConfigFile(char *dirname, char *filename) {
- char *path = NULL;
- FILE *file;
-
- if (asprintf(&path, "%s/%s", dirname, filename) == -1)
- return NULL;
-
- file = fopen(path, "w");
- free(path);
- return file;
-}
-
-static void
-unlinkConfigFile(char *dirname, char *filename) {
- char *path;
-
- if (asprintf(&path, "%s/%s", dirname, filename) != -1) {
- unlink(path);
- free(path);
- }
-}
-
-/*!
- * Build a test configuration directory, containing a CellServDB and ThisCell
- * file for the "example.org" cell
- *
- * @return
- * The path to the configuration directory. This should be freed by the caller
- * using free()
- *
- */
-
-char *
-buildTestConfig(void) {
- char *dir = NULL;
- FILE *file;
-
- if (asprintf(&dir, "%s/afs_XXXXXX", gettmpdir()) == -1)
- goto fail;
-
- if (mkdtemp(dir) == NULL)
- goto fail;
-
- /* Create a CellServDB */
- file = openConfigFile(dir, "CellServDB");
- fprintf(file, ">example.org # An example cell\n");
- fprintf(file, "127.0.0.1 #test.example.org\n");
- fclose(file);
-
- /* Create a ThisCell file */
- file = openConfigFile(dir, "ThisCell");
- fprintf(file, "example.org");
- fclose(file);
-
- return dir;
-
-fail:
- if (dir)
- free(dir);
- return NULL;
-}
-
-/*!
- * Delete at test configuration directory
- */
-
-void
-unlinkTestConfig(char *dir)
-{
- unlinkConfigFile(dir, "KeyFile");
- unlinkConfigFile(dir, "CellServDB");
- unlinkConfigFile(dir, "ThisCell");
- unlinkConfigFile(dir, "UserList");
- rmdir(dir);
-}
+++ /dev/null
-/*
- * Copyright (c) 2010 Your File System Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-extern char *buildTestConfig(void);
-extern void unlinkTestConfig(char *);
/* 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
--- /dev/null
+/*
+ * Copyright (c) 2010 Your File System Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+extern char *afstest_BuildTestConfig(void);
+extern void afstest_UnlinkTestConfig(char *);
--- /dev/null
+/*
+ * Copyright (c) 2010 Your File System Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*!
+ * Common functions for building a configuration directory
+ */
+
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
+#include <afs/afsutil.h>
+
+#include "common.h"
+
+static FILE *
+openConfigFile(char *dirname, char *filename) {
+ char *path = NULL;
+ FILE *file;
+
+ if (asprintf(&path, "%s/%s", dirname, filename) == -1)
+ return NULL;
+
+ file = fopen(path, "w");
+ free(path);
+ return file;
+}
+
+static void
+unlinkConfigFile(char *dirname, char *filename) {
+ char *path;
+
+ if (asprintf(&path, "%s/%s", dirname, filename) != -1) {
+ unlink(path);
+ free(path);
+ }
+}
+
+/*!
+ * Build a test configuration directory, containing a CellServDB and ThisCell
+ * file for the "example.org" cell
+ *
+ * @return
+ * The path to the configuration directory. This should be freed by the caller
+ * using free()
+ *
+ */
+
+char *
+afstest_BuildTestConfig(void) {
+ char *dir = NULL;
+ FILE *file;
+
+ if (asprintf(&dir, "%s/afs_XXXXXX", gettmpdir()) == -1)
+ goto fail;
+
+ if (mkdtemp(dir) == NULL)
+ goto fail;
+
+ /* Create a CellServDB */
+ file = openConfigFile(dir, "CellServDB");
+ fprintf(file, ">example.org # An example cell\n");
+ fprintf(file, "127.0.0.1 #test.example.org\n");
+ fclose(file);
+
+ /* Create a ThisCell file */
+ file = openConfigFile(dir, "ThisCell");
+ fprintf(file, "example.org");
+ fclose(file);
+
+ return dir;
+
+fail:
+ if (dir)
+ free(dir);
+ return NULL;
+}
+
+/*!
+ * Delete at test configuration directory
+ */
+
+void
+afstest_UnlinkTestConfig(char *dir)
+{
+ unlinkConfigFile(dir, "KeyFile");
+ unlinkConfigFile(dir, "CellServDB");
+ unlinkConfigFile(dir, "ThisCell");
+ unlinkConfigFile(dir, "UserList");
+ rmdir(dir);
+}
projects / packages / o / openafs.git / commitdiff