Fix make check

diff --git a/test/afpd/Makefile.am b/test/afpd/Makefile.am
index 6a3fd294b2197978610efa1e295512670a5007ca..a6896718f917ab0d427aa537e5c9dc2e66ffefe1 100644 (file)
--- a/test/afpd/Makefile.am
+++ b/test/afpd/Makefile.am
@@ -47,21 +47,20 @@ if HAVE_ACLS
 test_SOURCES += $(top_builddir)/etc/afpd/acls.c
 endif
 
-test_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/etc/afpd \
-        @ZEROCONF_CFLAGS@ \
-        -DAPPLCNAME \
-        -DSERVERTEXT=\"$(SERVERTEXT)/\" \
-        -D_PATH_AFPDDEFVOL=\"$(pkgconfdir)/AppleVolumes.default\" \
-        -D_PATH_AFPDSYSVOL=\"$(pkgconfdir)/AppleVolumes.system\" \
-        -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
-        -D_PATH_AFPDCONF=\"$(pkgconfdir)/afpd.conf\" \
-        -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
-        -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/afp_ldap.conf\" \
-        -D_PATH_AFPDSIGCONF=\"$(pkgconfdir)/afp_signature.conf\" \
-        -D_PATH_AFPDUUIDCONF=\"$(pkgconfdir)/afp_voluuid.conf\"
+test_CFLAGS = \
+       -I$(top_srcdir)/etc/afpd \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/sys \
+       @ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ \
+       -DAPPLCNAME \
+       -DSERVERTEXT=\"$(SERVERTEXT)/\" \
+       -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
+       -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
+       -D_PATH_CONFDIR=\"$(pkgconfdir)/\" \
+       -D_PATH_STATEDIR='"$(localstatedir)/netatalk/"'
 
-test_LDADD = $(top_builddir)/libatalk/cnid/libcnid.la \
+test_LDADD = \
        $(top_builddir)/libatalk/libatalk.la \
-       @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@
+       @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@
 
 test_LDFLAGS = -export-dynamic

diff --git a/test/afpd/afpfunc_helpers.c b/test/afpd/afpfunc_helpers.c
index fe443c15747bd50e3fee07086baedee53d8eb67e..4387bdfca7e852f7cb45e4f943cd352501c69df5 100644 (file)
--- a/test/afpd/afpfunc_helpers.c
+++ b/test/afpd/afpfunc_helpers.c
@@ -176,6 +176,7 @@ int enumerate(AFPObj *obj, uint16_t vid, cnid_t did)
     char buf[bufsize];
     char *p = buf;
     int len = 0;
+    int ret;
 
     ADD(p, len , 2);
 
@@ -189,7 +190,11 @@ int enumerate(AFPObj *obj, uint16_t vid, cnid_t did)
 
     len += push_path(&p, "");
 
-    return afp_enumerate_ext2(obj, buf, len, rbuf, &rbuflen);
+    ret = afp_enumerate_ext2(obj, buf, len, rbuf, &rbuflen);
+
+    if (ret != AFPERR_NOOBJ && ret != AFP_OK)
+        return -1;
+    return 0;
 }
 
 uint16_t openvol(AFPObj *obj, const char *name)

diff --git a/test/afpd/test.c b/test/afpd/test.c
index 74008019c7c77283f27e7ea719494b72eb3e960b..f442a75c37e567d2e11e3fa425df7243001ac6b8 100644 (file)
--- a/test/afpd/test.c
+++ b/test/afpd/test.c
@@ -29,6 +29,7 @@
 #include <atalk/queue.h>
 #include <atalk/bstrlib.h>
 #include <atalk/globals.h>
+#include <atalk/netatalk_conf.h>
 
 #include "file.h"
 #include "filedir.h"
@@ -44,15 +45,13 @@
 
 /* Stuff from main.c which of cource can't be added as source to testbin */
 unsigned char nologin = 0;
-struct afp_options default_options;
-static AFPConfig *configs;
-
+static AFPObj obj;
+#define ARGNUM 3
+static char *args[] = {"test", "-F", "test.conf"};
 /* Static variables */
 
 int main(int argc, char **argv)
 {
-    #define ARGNUM 7
-    char *args[ARGNUM] = {"test", "-F", "test.conf", "-f", "test.default", "-s" ,"test.system"};
     int reti;
     uint16_t vid;
     struct vol *vol;
@@ -60,22 +59,24 @@ int main(int argc, char **argv)
     struct path *path;
 
     /* initialize */
-    afp_version = 32;
     printf("Initializing\n============\n");
-    TEST(setuplog("default log_note /dev/tty"));
-    TEST(afp_options_init(&default_options));
-    TEST_int(afp_options_parse( ARGNUM, args, &default_options), 1);
-    TEST_expr(configs = configinit(&default_options), configs != NULL);
-    TEST(cnid_init());
-    TEST(load_volumes(&configs->obj));
-    TEST_int(dircache_init(8192), 0);
- 
+    TEST(setuplog("default:maxdebug","/dev/tty"));
+
+    TEST( afp_options_parse_cmdline(&obj, 3, &args[0]) );
+
+    TEST_int( afp_config_parse(&obj), 0);
+    TEST_int( configinit(&obj), 0);
+    TEST( cnid_init() );
+    TEST( load_volumes(&obj, NULL) );
+    TEST_int( dircache_init(8192), 0);
+    obj.afp_version = 32;
+
     printf("\n");
 
     /* now run tests */
     printf("Running tests\n=============\n");
 
-    TEST_expr(vid = openvol(&configs->obj, "test"), vid != 0);
+    TEST_expr(vid = openvol(&obj, "test"), vid != 0);
     TEST_expr(vol = getvolbyvid(vid), vol != NULL);
 
     /* test directory.c stuff */
@@ -84,27 +85,27 @@ int main(int argc, char **argv)
     TEST_expr(path = cname(vol, retdir, cnamewrap("Network Trash Folder")), path != NULL);
 
     TEST_expr(retdir = dirlookup(vol, DIRDID_ROOT), retdir != NULL);
-    TEST_int(getfiledirparms(&configs->obj, vid, DIRDID_ROOT_PARENT, "test"), 0);
-    TEST_int(getfiledirparms(&configs->obj, vid, DIRDID_ROOT, ""), 0);
+    TEST_int(getfiledirparms(&obj, vid, DIRDID_ROOT_PARENT, "test"), 0);
+    TEST_int(getfiledirparms(&obj, vid, DIRDID_ROOT, ""), 0);
 
-    TEST_expr(reti = createdir(&configs->obj, vid, DIRDID_ROOT, "dir1"),
+    TEST_expr(reti = createdir(&obj, vid, DIRDID_ROOT, "dir1"),
               reti == 0 || reti == AFPERR_EXIST);
 
-    TEST_int(getfiledirparms(&configs->obj, vid, DIRDID_ROOT, "dir1"), 0);
+    TEST_int(getfiledirparms(&obj, vid, DIRDID_ROOT, "dir1"), 0);
 /*
   FIXME: this doesn't work although it should. "//" get translated to \000 \000 at means ".."
   ie this should getfiledirparms for DIRDID_ROOT_PARENT -- at least afair!
     TEST_int(getfiledirparms(&configs->obj, vid, DIRDID_ROOT, "//"), 0);
 */
-    TEST_int(createfile(&configs->obj, vid, DIRDID_ROOT, "dir1/file1"), 0);
-    TEST_int(delete(&configs->obj, vid, DIRDID_ROOT, "dir1/file1"), 0);
-    TEST_int(delete(&configs->obj, vid, DIRDID_ROOT, "dir1"), 0);
+    TEST_int(createfile(&obj, vid, DIRDID_ROOT, "dir1/file1"), 0);
+    TEST_int(delete(&obj, vid, DIRDID_ROOT, "dir1/file1"), 0);
+    TEST_int(delete(&obj, vid, DIRDID_ROOT, "dir1"), 0);
 
-    TEST_int(createfile(&configs->obj, vid, DIRDID_ROOT, "file1"), 0);
-    TEST_int(getfiledirparms(&configs->obj, vid, DIRDID_ROOT, "file1"), 0);
-    TEST_int(delete(&configs->obj, vid, DIRDID_ROOT, "file1"), 0);
+    TEST_int(createfile(&obj, vid, DIRDID_ROOT, "file1"), 0);
+    TEST_int(getfiledirparms(&obj, vid, DIRDID_ROOT, "file1"), 0);
+    TEST_int(delete(&obj, vid, DIRDID_ROOT, "file1"), 0);
 
 
     /* test enumerate.c stuff */
-    TEST_int(enumerate(&configs->obj, vid, DIRDID_ROOT), 0);
+    TEST_int(enumerate(&obj, vid, DIRDID_ROOT), 0);
 }

diff --git a/test/afpd/test.sh b/test/afpd/test.sh
index 80066b6e118937b250413abece50a9fc18b0c33e..0396f689241801b84265f46ff68b04e887be0374 100755 (executable)
--- a/test/afpd/test.sh
+++ b/test/afpd/test.sh
@@ -10,15 +10,12 @@ fi
 if [ ! -f test.conf ] ; then
     echo -n "Creating configuration template ... "
     cat > test.conf <<EOF
-test -noddp -port 10548
-EOF
-    echo [ok]
-fi
+[Global]
+afp port = 10548
 
-if [ ! -f test.default ] ; then
-    echo -n "Creating volume config template ... "
-    cat > test.default <<EOF
-/tmp/AFPtestvolume "test" ea:none
+[test]
+path = /tmp/AFPtestvolume
+cnid scheme = last
 EOF
     echo [ok]
 fi