diff options
| author | Matt Goins <mjgoins@openflows.com> | 2009-03-10 09:33:05 -0400 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2009-03-10 09:33:05 -0400 |
| commit | 282c489f3101f0d744b66d88853a150e79b0870d (patch) | |
| tree | b4028ecbb3d313ba41f956cc00fea7925982bfbb /tests/basic | |
| parent | cec56faf07bb4f3b8d563e4f3c9042b6579356e2 (diff) | |
| parent | 69b3e256e2017d5664ef37d06aae5e5bcf446575 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'tests/basic')
| -rwxr-xr-x | tests/basic | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/tests/basic b/tests/basic index 9308e21..7277168 100755 --- a/tests/basic +++ b/tests/basic @@ -112,7 +112,7 @@ TEMPDIR=$(mktemp -d "${TMPDIR:-$TESTDIR/tmp}/monkeyspheretest.XXXXXXX") # Use the local copy of executables first, instead of system ones. # This should help us test without installing. -export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH" +export PATH="$TESTDIR"/../src:"$PATH" export MONKEYSPHERE_SYSDATADIR="$TEMPDIR" export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR" @@ -138,22 +138,6 @@ export SOCKET="$TEMPDIR"/ssh-socket # *anything* with any running X11 session. export DISPLAY=monkeys -## make sure that the version number matches the debian changelog -## (don't bother if this is being run from the tests). - -if [ -f "$TESTDIR"/../packaging/debian/changelog ]; then - echo - echo "##################################################" - echo "### checking version string match..." - repver=$(monkeysphere version) - debver=$(head -n1 "$TESTDIR"/../packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/') - if [ "$repver" = "$debver" ] ; then - echo "Versions match!" - else - printf "reported version string (%s) does not match debian changelog (%s)\n" "$repver" "$debver" - exit 1 - fi -fi ###################################################################### ### CONFIGURE ENVIRONMENTS @@ -291,7 +275,6 @@ monkeysphere-authentication update-users $(whoami) # FIXME: this is maybe not failing properly for: # ms: improper group or other writability on path '/tmp'. - ###################################################################### ### TESTS |