Loading...
--- libmalloc/libmalloc-317.100.9/tests/nano_trace_replay.c
+++ libmalloc/libmalloc-283.100.5/tests/nano_trace_replay.c
@@ -64,15 +64,11 @@
run_replay_tool(replay_file_path, tmp_dir, full_test_name, envp);
}
-#ifndef TEST_TIMEOUT
-#define TEST_TIMEOUT 1200
-#endif
-
-#define NANO_FRAG_TEST_VERSION(trace_name, nano_version, timeout) \
+#define NANO_FRAG_TEST_VERSION(trace_name, nano_version) \
T_DECL(nano_frag_## trace_name ## _ ## nano_version, "track Nano"#nano_version" fragmentation in "#trace_name, \
T_META_TAG_PERF, T_META_NAMESPACE("libmalloc"), \
T_META_GIT_ASSET_URL("ssh://git@stash.sd.apple.com/coreos/libmalloc.git"), \
- T_META_TIMEOUT(timeout), \
+ T_META_TIMEOUT(1200), \
T_META_GIT_ASSET("../traces/"#trace_name".mtrace")) \
{ \
const char *dt_assets = getenv("DT_ASSETS"); \
@@ -86,7 +82,7 @@
#elif CONFIG_NANOZONE && TARGET_OS_BRIDGE
-#define NANO_FRAG_TEST_VERSION(trace_name, nano_version, timeout) \
+#define NANO_FRAG_TEST_VERSION(trace_name, nano_version) \
T_DECL(nano_frag_## trace_name ## _ ## nano_version, "track Nano"#nano_version" fragmentation in "#trace_name, \
T_META_NAMESPACE("libmalloc")) \
{ \
@@ -95,7 +91,7 @@
#else // !CONFIG_NANOZONE && !TARGET_OS_BRIDGE
-#define NANO_FRAG_TEST_VERSION(trace_name, nano_version, timeout) \
+#define NANO_FRAG_TEST_VERSION(trace_name, nano_version) \
T_DECL(nano_frag_## trace_name ## _ ## nano_version, "track Nano"#nano_version" fragmentation in "#trace_name, \
T_META_NAMESPACE("libmalloc")) \
{ \
@@ -105,8 +101,8 @@
#endif // !CONFIG_NANOZONE && !TARGET_OS_BRIDGE
#define NANO_FRAG_TEST(trace_name) \
- NANO_FRAG_TEST_VERSION(trace_name, V1, TEST_TIMEOUT) \
- NANO_FRAG_TEST_VERSION(trace_name, V2, TEST_TIMEOUT)
+ NANO_FRAG_TEST_VERSION(trace_name, V1) \
+ NANO_FRAG_TEST_VERSION(trace_name, V2)
NANO_FRAG_TEST(TRACE_NAME)