aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-12-08 15:56:50 +0100
committerLukas Larsson <[email protected]>2011-12-08 15:59:49 +0100
commit7d79fd6eb57a073e58080d52e98881bd85f8fcc9 (patch)
treebadba945b18de02ab8b3f7e8ec1d6a8948529c8b /erts/test
parent3323324c28d9102099b03e266f5c36aee0183f2c (diff)
parentf160ef80b3044b697f9f4714b02f52eb11fbdf33 (diff)
downloadotp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.tar.gz
otp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.tar.bz2
otp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.zip
Merge branch 'lukas/bugs_and_tc_fixes'
* lukas/bugs_and_tc_fixes: Fix test_server test makefile for windows Only step pointer arity steps Link with LIBS after ETHR_LIBS Save +M<S>t data as true or false, not the number Return true/false instead of num for +M<S>t info Return correct format for info about sys_alloc Add explanatory text for tc failure OTP-9800
Diffstat (limited to 'erts/test')
-rw-r--r--erts/test/erl_print_SUITE_data/Makefile.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/test/erl_print_SUITE_data/Makefile.src b/erts/test/erl_print_SUITE_data/Makefile.src
index 109d55e572..9164c672dc 100644
--- a/erts/test/erl_print_SUITE_data/Makefile.src
+++ b/erts/test/erl_print_SUITE_data/Makefile.src
@@ -27,7 +27,7 @@ EPTF_CFLAGS = -Wall $(CFLAGS) @DEFS@ -I@erts_lib_include_internal@ -I@erts_lib_i
EPTF_LIBS = $(LIBS) -L@erts_lib_internal_path@ -lerts_internal@type_marker@
EPTT_CFLAGS = -DTHREAD_SAFE $(ETHR_DEFS) $(EPTF_CFLAGS)
-EPTT_LIBS = $(LIBS) -L@erts_lib_internal_path@ -lerts_internal_r@type_marker@ $(ETHR_LIBS)
+EPTT_LIBS = -L@erts_lib_internal_path@ -lerts_internal_r@type_marker@ $(ETHR_LIBS) $(LIBS)
GCC = .@DS@gccifier -CC"$(CC)"