Revision 70041061

b/.gitignore
24 24
/autotools/missing
25 25
/autotools/py-compile
26 26
/autotools/replace_vars.sed
27
/autotools/testrunner
27 28
/config.log
28 29
/config.status
29 30
/configure
b/Makefile.am
137 137
	$(PYTHON_BOOTSTRAP) \
138 138
	epydoc.conf \
139 139
	autotools/replace_vars.sed \
140
	autotools/testrunner \
140 141
	daemons/daemon-util \
141 142
	daemons/ganeti-cleaner \
142 143
	devel/upload \
......
430 431
# Things to build but not to install (add it to EXTRA_DIST if it should be
431 432
# distributed)
432 433
noinst_DATA = \
434
	autotools/testrunner \
433 435
	devel/upload \
434 436
	doc/html \
435 437
	$(BUILT_EXAMPLES) \
......
566 568
	autotools/convert-constants \
567 569
	autotools/docpp \
568 570
	autotools/gen-coverage \
569
	autotools/testrunner \
571
	autotools/testrunner.in \
570 572
	$(RUN_IN_TEMPDIR) \
571 573
	daemons/daemon-util.in \
572 574
	daemons/ganeti-cleaner.in \
......
838 840
	sed -f $(REPLACE_VARS_SED) < $< > $@
839 841
	chmod +x $@
840 842

  
843
autotools/testrunner: autotools/testrunner.in $(REPLACE_VARS_SED)
844
	sed -f $(REPLACE_VARS_SED) < $< > $@
845
	chmod u+x $@
846

  
841 847
devel/upload: devel/upload.in $(REPLACE_VARS_SED)
842 848
	sed -f $(REPLACE_VARS_SED) < $< > $@
843 849
	chmod u+x $@
......
1048 1054
	  echo 's#@GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
1049 1055
	  echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
1050 1056
	  echo 's#@CUSTOM_ENABLE_CONFD@#$(ENABLE_CONFD)#g'; \
1057
	  echo 's#@FAKEROOT@#$(FAKEROOT_PATH)#g'; \
1051 1058
	} > $@
1052 1059

  
1053 1060
# Using deferred evaluation
/dev/null
1
#!/bin/bash
2
#
3

  
4
# Copyright (C) 2010 Google Inc.
5
#
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
10
#
11
# This program is distributed in the hope that it will be useful, but
12
# WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
# General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
19
# 02110-1301, USA.
20

  
21
set -e
22

  
23
filename=$1
24

  
25
case "$filename" in
26
  *.py) exec $PYTHON "$@" ;;
27
  *) exec "$@" ;;
28
esac
b/autotools/testrunner.in
1
#!/bin/bash
2
#
3

  
4
# Copyright (C) 2010, 2011 Google Inc.
5
#
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
10
#
11
# This program is distributed in the hope that it will be useful, but
12
# WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
# General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
19
# 02110-1301, USA.
20

  
21
set -e
22

  
23
FAKEROOT='@FAKEROOT@'
24

  
25
filename=$1
26

  
27
execasroot() {
28
  if [[ -z "$FAKEROOT" ]]; then
29
    echo "'fakeroot' not found at configure time" >&2
30
    exit 1
31
  fi
32
  exec "$FAKEROOT" "$@"
33
}
34

  
35
case "$filename" in
36
  *-runasroot.py) execasroot $PYTHON "$@" ;;
37
  *.py) exec $PYTHON "$@" ;;
38
  *-runasroot) execasroot "$@" ;;
39
  *) exec "$@" ;;
40
esac
b/configure.ac
487 487
AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$GHC_PKG_QUICKCHECK" != x])
488 488
AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes])
489 489

  
490
# Check for fakeroot
491
AC_ARG_VAR(FAKEROOT_PATH, [fakeroot path])
492
AC_PATH_PROG(FAKEROOT_PATH, [fakeroot], [])
493
if test -z "$FAKEROOT_PATH"; then
494
  AC_MSG_WARN(m4_normalize([fakeroot not found, tests that must run as root
495
                            will not be executed]))
496
fi
497
AM_CONDITIONAL([HAS_FAKEROOT], [test "x$FAKEROOT_PATH" != x])
498

  
490 499
SOCAT_USE_ESCAPE=
491 500
AC_ARG_ENABLE([socat-escape],
492 501
  [AS_HELP_STRING([--enable-socat-escape],

Also available in: Unified diff