[GNUnet-SVN] r11112 - in gnunet: . src/migration src/peerinfo-tool

[gnunet]

Author: amatus
Date: 2010-04-29 08:10:59 +0200 (Thu, 29 Apr 2010)
New Revision: 11112

Removed:
   gnunet/src/migration/gnunet-daemon-migration
Modified:
   gnunet/configure.ac
   gnunet/src/peerinfo-tool/Makefile.am
   gnunet/src/peerinfo-tool/test_gnunet_peerinfo.py
Log:
Modified configure.ac to check for the python interpreter so that we can run 
test scripts with it. Also removed gnunet-daemon-migration which is a generated 
file.


Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2010-04-28 17:12:27 UTC (rev 11111)
+++ gnunet/configure.ac 2010-04-29 06:10:59 UTC (rev 11112)
@@ -485,15 +485,21 @@
 LIBS=$SAVE_LIBS
 
 # check for python & pexpect (used for some testcases only)
-AC_MSG_CHECKING([for python and pexpect])
-/usr/bin/python -c "import pexpect" > /dev/null 2> /dev/null
-PYEX=$?
-AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
-if test $PYEX -eq 0
+AM_PATH_PYTHON([2.5],, [:])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+
+if test "$PYTHON" != :
 then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([not found])
+  AC_MSG_CHECKING([for pexpect])
+  $PYTHON -c "import pexpect" > /dev/null 2> /dev/null
+  PYEX=$?
+  AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
+  if test $PYEX -eq 0
+  then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([not found])
+  fi
 fi
 
 # libesmtp

Deleted: gnunet/src/migration/gnunet-daemon-migration
===================================================================
--- gnunet/src/migration/gnunet-daemon-migration        2010-04-28 17:12:27 UTC 
(rev 11111)
+++ gnunet/src/migration/gnunet-daemon-migration        2010-04-29 06:10:59 UTC 
(rev 11112)
@@ -1,148 +0,0 @@
-#! /bin/bash
-
-# gnunet-daemon-migration - temporary wrapper script for 
.libs/gnunet-daemon-migration
-# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2
-#
-# The gnunet-daemon-migration program cannot be directly executed until all 
the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='/bin/sed -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command="(cd /home/grothoff/svn/gnunet/src/migration; { test -z 
\"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export 
LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH 
|| { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z 
\"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; 
export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset 
LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z 
\"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; 
export LD_LIBRARY_PATH; }; }; 
PATH=/opt/eclipse/:/opt/jdk1.6.0_17//bin:/home/grothoff/bin:/home/grothoff/bin:/opt/eclipse/:/opt/jdk1.6.0_17//bin:/home/grothoff/bin:/usr/local/bin:/usr/bin:/bin:/usr/games;
 export PATH; gcc -fno-strict-aliasing -Wall -g -O0 -Wall -Werror -o 
\$progdir/\$file gnunet-daemon-migration.o  -L/home/grothoff//lib 
../../src/datastore/.libs/libgnunetdatastore.so ../../src/statistics/.libs/
 libgnunetstatistics.so ../../src/core/.libs/libgnunetcore.so 
../../src/util/.libs/libgnunetutil.so -ldl -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/datastore/.libs -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/statistics/.libs -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/core/.libs -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/util/.libs -Wl,-rpath -Wl,/home/grothoff/lib)"
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='2.2.6b'
-  notinst_deplibs=' ../../src/datastore/libgnunetdatastore.la 
../../src/statistics/libgnunetstatistics.la ../../src/core/libgnunetcore.la 
../../src/util/libgnunetutil.la'
-else
-  # When we are sourced in execute mode, $file and $ECHO are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    ECHO="echo"
-    file="$0"
-    # Make sure echo works.
-    if test "X$1" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-      # Yippee, $ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe $ECHO will work.
-      exec /bin/bash "$0" --no-reexec ${1+"$@"}
-    fi
-  fi
-
-  # Find the directory that this script lives in.
-  thisdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
-  done
-
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
-  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
-    # special case for '.'
-    if test "$thisdir" = "."; then
-      thisdir=`pwd`
-    fi
-    # remove .libs from thisdir
-    case "$thisdir" in
-    *[\\/].libs ) thisdir=`$ECHO "X$thisdir" | $Xsed -e 's%[\\/][^\\/]*$%%'` ;;
-    .libs )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'gnunet-daemon-migration'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" ||
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | 
/bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-       echo "$relink_command_output" >&2
-       rm -f "$progdir/$file"
-       exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-
-      exec "$progdir/$program" ${1+"$@"}
-
-      $ECHO "$0: cannot exec $program $*" 1>&2
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
-    $ECHO "This script is just a wrapper for $program." 1>&2
-    echo "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi

Modified: gnunet/src/peerinfo-tool/Makefile.am
===================================================================
--- gnunet/src/peerinfo-tool/Makefile.am        2010-04-28 17:12:27 UTC (rev 
11111)
+++ gnunet/src/peerinfo-tool/Makefile.am        2010-04-29 06:10:59 UTC (rev 
11112)
@@ -19,9 +19,9 @@
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
-
 if HAVE_PYTHON_PEXPECT
-check_SCRIPTS = \
+TESTS_ENVIRONMENT = $(PYTHON)
+TESTS = \
  test_gnunet_peerinfo.py 
 endif
 

Modified: gnunet/src/peerinfo-tool/test_gnunet_peerinfo.py
===================================================================
--- gnunet/src/peerinfo-tool/test_gnunet_peerinfo.py    2010-04-28 17:12:27 UTC 
(rev 11111)
+++ gnunet/src/peerinfo-tool/test_gnunet_peerinfo.py    2010-04-29 06:10:59 UTC 
(rev 11112)
@@ -1,4 +1,4 @@
-#!/usr/bin/python 
+#!/usr/bin/env python
 #    This file is part of GNUnet.
 #    (C) 2010 Christian Grothoff (and other contributing authors)
 #