Revert "Add some basic tests to check out fuse"

This reverts commit 94bf003a720c9a883ba7ebf43ab3053d3072d3dd.

The fuse tests are fundamentally broken as they stand:

*) They rely on files that have not been committed to the tree. To
   function correctly the file fuse/conf/CellServDB must be present
*) They always run, regardless of whether the fuse helper binaries are
   installed on the developers system, or even on whether the tree was
   built with fuse support enabled.
*) They pass, even if fuse fails to start up
*) The file fuse.sh is committed, despite being unused. This is
   particularly confusing, as it looks like this is where the tests
   are performed from (its not, testing is done in dynroot-t)
*) fuse-log should be either cleaned up, or flagged as ignored in
   .gitignore

Revert the commit until such time as all these issues can be fixed

Change-Id: I5ff9a95f33c0a5d0614bb47c521a8770d92fe2eb
Reviewed-on: http://gerrit.openafs.org/8230
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/Makefile.in b/Makefile.in
index cf74460..44d914a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,10 +139,7 @@ prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/
 
 project: cmd comerr 
 
-tests: all_nolibafs
-       +${COMPILE_PART1} tests ${COMPILE_PART2}
-
-tests_libafs: all
+tests: all 
        +${COMPILE_PART1} tests ${COMPILE_PART2}
 
 config: prelude
@@ -659,7 +656,7 @@ finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth lo
 rpctestlib: util fsint rx opr libafsrpc libafsauthent
        +${TEST_PART1} rpctestlib  ${COMPILE_PART2}
 
-check test: finale_nolibafs
+check test: finale
        cd tests && $(MAKE) check
 
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.

diff --git a/configure.ac b/configure.ac
index 036d6fc..6277815 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -265,7 +265,6 @@ tests/Makefile \
 tests/auth/Makefile \
 tests/cmd/Makefile \
 tests/common/Makefile \
-tests/fuse/Makefile \
 tests/opr/Makefile \
 tests/rpctestlib/Makefile \
 tests/rx/Makefile \

diff --git a/tests/TESTS b/tests/TESTS
index 0c08189..59c4fb3 100644 (file)
--- a/tests/TESTS
+++ b/tests/TESTS
@@ -18,4 +18,3 @@ volser/vos-man
 volser/vos
 bucoord/backup-man
 kauth/kas-man
-fuse/dynroot

diff --git a/tests/fuse/Makefile.in b/tests/fuse/Makefile.in
deleted file mode 100644 (file)
index 71846c7..0000000
--- a/tests/fuse/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# This software has been released under the terms of the IBM Public
-# License.  For details, see the LICENSE file in the top-level source
-# directory or online at http://www.openafs.org/dl/license10.html
-#
-# This file (software) make also be used separately from OpenAFS
-# under other licenses, contact the author(s) listed below for details.
-#
-# copyright 2011, 2012 Troy Benjegerdes <hozer@hozed.org>
-
-CELLSRV=@TOP_OBJDIR@/src/afsd/CellServDB
-
-conf/CellServDB: $(CELLSRV)
-       cp $(CELLSRV) conf/

diff --git a/tests/fuse/conf/ThisCell b/tests/fuse/conf/ThisCell
deleted file mode 100644 (file)
index ebb8cea..0000000
--- a/tests/fuse/conf/ThisCell
+++ /dev/null
@@ -1 +0,0 @@
-test.cell

diff --git a/tests/fuse/conf/cacheinfo b/tests/fuse/conf/cacheinfo
deleted file mode 100644 (file)
index f5fe457..0000000
--- a/tests/fuse/conf/cacheinfo
+++ /dev/null
@@ -1 +0,0 @@
-mntdir:vcache:100000

diff --git a/tests/fuse/dynroot-t b/tests/fuse/dynroot-t
deleted file mode 100755 (executable)
index c84eefd..0000000
--- a/tests/fuse/dynroot-t
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# This software has been released under the terms of the IBM Public
-# License.  For details, see the LICENSE file in the top-level source
-# directory or online at http://www.openafs.org/dl/license10.html
-#
-# This file (software) may also be used separately from OpenAFS
-# under other licenses, contact the author(s) listed below for details.
-#
-# copyright 2011, 2012 Troy Benjegerdes <hozer@hozed.org>
-
-. tap/libtap.sh
-
-
-plan 1
-
-
-grep -e "^>" fuse/conf/CellServDB  | cut -d " " -f 1 | cut -b2- | sort > fuse/cells.tmp
-
-(cd fuse; ./try-fuse.sh > ./fuse-log 2>&1 ) &
-
-fusepid=$!
-
-sleep 1
-ls fuse/mntdir | sort > fuse/ls.tmp
-ok "ls dynroot" diff fuse/cells.tmp fuse/ls.tmp
-
-rm fuse/cells.tmp fuse/ls.tmp
-
-#not the best way to handle this
-killall afsd.fuse
-
-wait

diff --git a/tests/fuse/fuse.sh b/tests/fuse/fuse.sh
deleted file mode 100755 (executable)
index 10f497a..0000000
--- a/tests/fuse/fuse.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# This software has been released under the terms of the IBM Public
-# License.  For details, see the LICENSE file in the top-level source
-# directory or online at http://www.openafs.org/dl/license10.html
-#
-# This file (software) may also be used separately from OpenAFS
-# under other licenses, contact the author(s) listed below for details.
-#
-# This software copyright 2011, 2012 Troy Benjegerdes <hozer@hozed.org>
-
-. ../tap/libtap.sh
-
-
-plan 1
-
-if [ ! -f "$TOPDIR/src/afsd/afsd.fuse" ] ; then
-    skip_all
-fi
-
-grep -e "^>" conf/CellServDB  | cut -d " " -f 1 | cut -b2- | sort > cells.tmp
-
-(./try-fuse.sh > fuse-log 2>&1 ) &
-
-fusepid=$!
-
-sleep 1
-ls mntdir | sort > ls.tmp
-ok "ls dynroot" diff cells.tmp ls.tmp
-
-rm cells.tmp ls.tmp
-
-kill $fusepid
-
-wait $fusepid

diff --git a/tests/fuse/try-fuse.sh b/tests/fuse/try-fuse.sh
deleted file mode 100755 (executable)
index f5458f9..0000000
--- a/tests/fuse/try-fuse.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -x
-#
-# This software has been released under the terms of the IBM Public
-# License.  For details, see the LICENSE file in the top-level source
-# directory or online at http://www.openafs.org/dl/license10.html
-#
-# This file (software) may also be used separately from OpenAFS
-# under other licenses, contact the author(s) listed below for details.
-#
-# copyright 2011, 2012 Troy Benjegerdes <hozer@hozed.org>
-
-TESTDIR=$PWD
-TOPDIR=$PWD/../..
-
-export LD_LIBRARY_PATH=$TOPDIR/lib
-
-#in case there's a stale mount here
-fusermount -u $TESTDIR/mntdir
-
-$TOPDIR/src/afsd/afsd.fuse -dynroot -fakestat -d -confdir $TESTDIR/conf -cachedir $TESTDIR/vcache -mountdir $TESTDIR/mntdir
-
-
-fusermount -u $TESTDIR/mntdir