aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Barksdale <amatus.amongus@gmail.com>2010-04-29 06:10:59 +0000
committerDavid Barksdale <amatus.amongus@gmail.com>2010-04-29 06:10:59 +0000
commitcc57cfa030d9a44fad09e9f7d957b5e2c725b00a (patch)
treefbc54f767ca7579fc7d5f9c4c293aa844fa42e5c
parentc4e2aab3fe835e67fd2a5b27c348a524da12ad74 (diff)
downloadgnunet-cc57cfa030d9a44fad09e9f7d957b5e2c725b00a.tar.gz
gnunet-cc57cfa030d9a44fad09e9f7d957b5e2c725b00a.zip
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.
-rw-r--r--configure.ac22
-rwxr-xr-xsrc/migration/gnunet-daemon-migration148
-rw-r--r--src/peerinfo-tool/Makefile.am4
-rwxr-xr-xsrc/peerinfo-tool/test_gnunet_peerinfo.py2
4 files changed, 17 insertions, 159 deletions
diff --git a/configure.ac b/configure.ac
index adc777ee0..0fd4d43a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -485,15 +485,21 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
485LIBS=$SAVE_LIBS 485LIBS=$SAVE_LIBS
486 486
487# check for python & pexpect (used for some testcases only) 487# check for python & pexpect (used for some testcases only)
488AC_MSG_CHECKING([for python and pexpect]) 488AM_PATH_PYTHON([2.5],, [:])
489/usr/bin/python -c "import pexpect" > /dev/null 2> /dev/null 489AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
490PYEX=$? 490
491AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0) 491if test "$PYTHON" != :
492if test $PYEX -eq 0
493then 492then
494 AC_MSG_RESULT([yes]) 493 AC_MSG_CHECKING([for pexpect])
495else 494 $PYTHON -c "import pexpect" > /dev/null 2> /dev/null
496 AC_MSG_RESULT([not found]) 495 PYEX=$?
496 AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
497 if test $PYEX -eq 0
498 then
499 AC_MSG_RESULT([yes])
500 else
501 AC_MSG_RESULT([not found])
502 fi
497fi 503fi
498 504
499# libesmtp 505# libesmtp
diff --git a/src/migration/gnunet-daemon-migration b/src/migration/gnunet-daemon-migration
deleted file mode 100755
index 149fe2c15..000000000
--- a/src/migration/gnunet-daemon-migration
+++ /dev/null
@@ -1,148 +0,0 @@
1#! /bin/bash
2
3# gnunet-daemon-migration - temporary wrapper script for .libs/gnunet-daemon-migration
4# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2
5#
6# The gnunet-daemon-migration program cannot be directly executed until all the libtool
7# libraries that it depends on are installed.
8#
9# This wrapper script should never be moved out of the build directory.
10# If it is, it will not operate correctly.
11
12# Sed substitution that helps us do robust quoting. It backslashifies
13# metacharacters that are still active within double-quoted strings.
14Xsed='/bin/sed -e 1s/^X//'
15sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
16
17# Be Bourne compatible
18if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
19 emulate sh
20 NULLCMD=:
21 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
22 # is contrary to our usage. Disable this feature.
23 alias -g '${1+"$@"}'='"$@"'
24 setopt NO_GLOB_SUBST
25else
26 case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
27fi
28BIN_SH=xpg4; export BIN_SH # for Tru64
29DUALCASE=1; export DUALCASE # for MKS sh
30
31# The HP-UX ksh and POSIX shell print the target directory to stdout
32# if CDPATH is set.
33(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
34
35relink_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)"
36
37# This environment variable determines our operation mode.
38if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
39 # install mode needs the following variables:
40 generated_by_libtool_version='2.2.6b'
41 notinst_deplibs=' ../../src/datastore/libgnunetdatastore.la ../../src/statistics/libgnunetstatistics.la ../../src/core/libgnunetcore.la ../../src/util/libgnunetutil.la'
42else
43 # When we are sourced in execute mode, $file and $ECHO are already set.
44 if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
45 ECHO="echo"
46 file="$0"
47 # Make sure echo works.
48 if test "X$1" = X--no-reexec; then
49 # Discard the --no-reexec flag, and continue.
50 shift
51 elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
52 # Yippee, $ECHO works!
53 :
54 else
55 # Restart under the correct shell, and then maybe $ECHO will work.
56 exec /bin/bash "$0" --no-reexec ${1+"$@"}
57 fi
58 fi
59
60 # Find the directory that this script lives in.
61 thisdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
62 test "x$thisdir" = "x$file" && thisdir=.
63
64 # Follow symbolic links until we get to the real thisdir.
65 file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
66 while test -n "$file"; do
67 destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
68
69 # If there was a directory component, then change thisdir.
70 if test "x$destdir" != "x$file"; then
71 case "$destdir" in
72 [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
73 *) thisdir="$thisdir/$destdir" ;;
74 esac
75 fi
76
77 file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
78 file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
79 done
80
81
82 # Usually 'no', except on cygwin/mingw when embedded into
83 # the cwrapper.
84 WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
85 if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
86 # special case for '.'
87 if test "$thisdir" = "."; then
88 thisdir=`pwd`
89 fi
90 # remove .libs from thisdir
91 case "$thisdir" in
92 *[\\/].libs ) thisdir=`$ECHO "X$thisdir" | $Xsed -e 's%[\\/][^\\/]*$%%'` ;;
93 .libs ) thisdir=. ;;
94 esac
95 fi
96
97 # Try to get the absolute directory name.
98 absdir=`cd "$thisdir" && pwd`
99 test -n "$absdir" && thisdir="$absdir"
100
101 program=lt-'gnunet-daemon-migration'
102 progdir="$thisdir/.libs"
103
104 if test ! -f "$progdir/$program" ||
105 { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
106 test "X$file" != "X$progdir/$program"; }; then
107
108 file="$$-$program"
109
110 if test ! -d "$progdir"; then
111 mkdir "$progdir"
112 else
113 rm -f "$progdir/$file"
114 fi
115
116 # relink executable if necessary
117 if test -n "$relink_command"; then
118 if relink_command_output=`eval $relink_command 2>&1`; then :
119 else
120 echo "$relink_command_output" >&2
121 rm -f "$progdir/$file"
122 exit 1
123 fi
124 fi
125
126 mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
127 { rm -f "$progdir/$program";
128 mv -f "$progdir/$file" "$progdir/$program"; }
129 rm -f "$progdir/$file"
130 fi
131
132 if test -f "$progdir/$program"; then
133 if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
134 # Run the actual program with our arguments.
135
136 exec "$progdir/$program" ${1+"$@"}
137
138 $ECHO "$0: cannot exec $program $*" 1>&2
139 exit 1
140 fi
141 else
142 # The program doesn't exist.
143 $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
144 $ECHO "This script is just a wrapper for $program." 1>&2
145 echo "See the libtool documentation for more information." 1>&2
146 exit 1
147 fi
148fi
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index 25885a34c..20f657b41 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -19,9 +19,9 @@ gnunet_peerinfo_LDADD = \
19 $(top_builddir)/src/transport/libgnunettransport.la \ 19 $(top_builddir)/src/transport/libgnunettransport.la \
20 $(top_builddir)/src/util/libgnunetutil.la 20 $(top_builddir)/src/util/libgnunetutil.la
21 21
22
23if HAVE_PYTHON_PEXPECT 22if HAVE_PYTHON_PEXPECT
24check_SCRIPTS = \ 23TESTS_ENVIRONMENT = $(PYTHON)
24TESTS = \
25 test_gnunet_peerinfo.py 25 test_gnunet_peerinfo.py
26endif 26endif
27 27
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py b/src/peerinfo-tool/test_gnunet_peerinfo.py
index 804b4cb2a..bab59ee47 100755
--- a/src/peerinfo-tool/test_gnunet_peerinfo.py
+++ b/src/peerinfo-tool/test_gnunet_peerinfo.py
@@ -1,4 +1,4 @@
1#!/usr/bin/python 1#!/usr/bin/env python
2# This file is part of GNUnet. 2# This file is part of GNUnet.
3# (C) 2010 Christian Grothoff (and other contributing authors) 3# (C) 2010 Christian Grothoff (and other contributing authors)
4# 4#