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

2 files changed, 3 insertions, 4 deletions

diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 1379f8645a..1e75afe6f6 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -2877,8 +2877,9 @@ reply_alloc_info(void *vair)
 					      ainfo);
 			ainfo = erts_bld_tuple(hpp, szp, 2,
 					       erts_bld_atom(hpp, szp,
-							     "otps"),
+							     "options"),
 					       ainfo);
+			ainfo = erts_bld_cons(hpp, szp,ainfo,NIL);
 		    }
 		    ainfo = erts_bld_tuple(hpp, szp, 3,
 					   alloc_atom,
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index af386c9197..c32938bdff 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -3014,9 +3014,7 @@ info_options(Allctr_t *allctr,
 	add_2tup(hpp, szp, &res, am.low, allctr->mseg_opt.low_mem ? am_true : am_false);
 #endif
 	add_2tup(hpp, szp, &res, am.ramv, allctr->ramv ? am_true : am_false);
-	add_2tup(hpp, szp, &res, am.t, (allctr->t
-					? bld_uint(hpp, szp, (Uint) allctr->t)
-					: am_false));
+	add_2tup(hpp, szp, &res, am.t, (allctr->t ? am_true : am_false));
 	add_2tup(hpp, szp, &res, am.e, am_true);
     }