Merge pull request #541 from joelhock/remove-vestigial-fail-pre-init-calls

remove vestigial FAIL_PRE_INIT_CALLS code

Author: wolfcw

src/Makefile

@@ -95,11 +95,6 @@
 #         - avoid that the faketime wrapper complains when running within a
 #           libfaketime environment
 #
-#     FAIL_PRE_INIT_CALLS
-#         - If the time is queried before the library was initialised, let the
-#           call fail instead of trying to initialise on-the-fly. This fixes /
-#           works around hangs that were seen with address sanitizer.
-#
 #   * Compilation addition: second libMT target added for building the pthread-
 #     enabled library as a separate library
 #

test/Makefile

@@ -29,7 +29,7 @@ timetest: ${OBJ}
 shm_layout_test: shm_layout_test.c ../src/faketime_common.h
 	${CC} -o $@ ${CFLAGS} $<
 
-test: timetest functest libmallocintercept.so
+test: timetest functest
 	@echo
 	@./test.sh
 
@@ -43,9 +43,6 @@ functest:
 randomtest: repeat_random
 	./randomtest.sh
 
-libmallocintercept.so: libmallocintercept.c
-	${CC} -shared -o $@ -fpic ${CFLAGS} $<
-
 # ensure our variadic argument unpacking/repacking works as expected
 confirm_variadic_promotion: variadic_promotion
 	./variadic_promotion

test/libmallocintercept.c

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 FTPL="${FAKETIME_TESTLIB:-../src/libfaketime.so.1}"
-MALLOC_INTERCEPT=./libmallocintercept.so
 
 if [ -f /etc/faketimerc ] ; then
 	echo "Running the test program with your system-wide default in /etc/faketimerc"
@@ -66,14 +65,6 @@ echo
 echo "============================================================================="
 echo
 
-echo "Running the test program with malloc interception"
-echo "\$ LD_PRELOAD=./libmallocintercept.so:$FTPL ./timetest"
-LD_PRELOAD="./libmallocintercept.so:$FTPL" ./timetest
-echo
-
-echo "============================================================================="
-echo
-
 echo "@2005-03-29 14:14:14" > .faketimerc-for-test
 echo "Running the test program with malloc interception and file faketimerc"
 echo "\$ FAKETIME_NO_CACHE=1 FAKETIME_TIMESTAMP_FILE=.faketimerc-for-test LD_PRELOAD=./libmallocintercept.so:$FTPL ./timetest"