Commit 9d4d5b79 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

debian/rules: Remove logic that ignores the result of unit tests if 

localhost does not resolve (or not to 127.0.0.1).  This should no longer
be necessary as our build chroots have gotten a lot better.
parent e4d53e94

debian/changelog

+4 −1
Original line number Diff line number Diff line
@@ -2,8 +2,11 @@ tor (0.2.2.7-alpha-2) experimental; urgency=low 


  * debian/rules: Minor cleanup (use a single variable for making up our

    configure flags, not two).

  * debian/rules: Remove logic that ignores the result of unit tests if

    localhost does not resolve (or not to 127.0.0.1).  This should no

    longer be necessary as our build chroots have gotten a lot better.



 -- Peter Palfrader <weasel@debian.org>  Sun, 24 Jan 2010 12:55:21 +0100

 -- Peter Palfrader <weasel@debian.org>  Sun, 24 Jan 2010 13:22:26 +0100



tor (0.2.2.7-alpha-1) experimental; urgency=medium

debian/rules

+1 −12
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ endif 


CFLAGS ?= -Wall -g



LOCALHOST_IP  ?= $(shell getent hosts localhost | awk '{print $$1}')



# Do not optimize the build with "noopt"

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

	CFLAGS += -O0
@@ -70,7 +68,6 @@ config.status: configure 
	! [ -e src/test/test.h ] || mv src/test/test.h src/test/test.h.orig

	cp debian/src-test-test.h src/test/test.h



	@if [ "$(LOCALHOST_IP)" != "127.0.0.1" ]; then echo; echo; echo; echo; echo; echo "######################################################################"; echo "WARNING: This system does not think localhost is 127.0.0.1.  Will ignore result of testsuite.  Please fix your system/chroot."; echo "######################################################################"; echo; echo; echo; echo; echo "Note: 'getent hosts localhost' should return '127.0.0.1 localhost'"; echo; fi

	dh_testdir

	CFLAGS="$(CFLAGS)" ./configure \

		$(confflags) \
@@ -92,14 +89,7 @@ build-stamp: config.status 
	@echo

	# Running unit tests

	@if [ "$(RUN_TEST)" != "no" ]; then \

		if [ "$(LOCALHOST_IP)" != "127.0.0.1" ]; then \

			echo; echo; echo "######################################################################"; echo "WARNING: This system does not think localhost is 127.0.0.1.  Will ignore result of testsuite.  Please fix your system/chroot."; echo "######################################################################"; echo; echo; \

			echo "make check || true"; \

			make check || true; \

		else \

			echo "make check"; \

		make check; \

		fi; \

	else \

		echo; echo; echo "Skipping unittests"; echo; \

	fi
@@ -220,7 +210,6 @@ binary-indep: install 
# Build architecture dependant packages using the common target.

binary-arch: install

	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common

	@if [ "$(LOCALHOST_IP)" != "127.0.0.1" ]; then echo; echo; echo; echo; echo; echo "######################################################################"; echo "WARNING: This system does not think localhost is 127.0.0.1.  Result of testsuite has been ignored.  Please fix your system/chroot."; echo "######################################################################"; echo; echo; echo; echo; echo "Note: 'getent hosts localhost' should return '127.0.0.1 localhost'"; echo; fi



binary: binary-indep binary-arch

.PHONY: build clean binary-common binary-indep binary-arch binary install