--- libmalloc/libmalloc-140.50.6/tests/Makefile
+++ libmalloc/libmalloc-521.120.7/tests/Makefile
@@ -1,71 +1,62 @@
 PROJECT := libmalloc
 TEST_DIR := tests/
 
-DEVELOPER_DIR ?= /Applications/Xcode.app/Contents/Developer/
+DEVELOPER_DIR ?= $(shell xcode-select -p)
 
 include $(DEVELOPER_DIR)/AppleInternal/Makefiles/darwintest/Makefile.common
 
-MALLOCBENCH_SOURCE := $(wildcard MallocBench/*.cpp)
-EXCLUDED_SOURCES := MallocBench.cpp
+TRACE_FILES := \
+	$(notdir $(wildcard $(SRCROOT)/../traces/*.mtrace))
+
+# add trace files without the traces/ prefix, fex:
+#   exclude_this_file.mtrace
+EXCLUDED_TRACE_FILES :=
+
+OTHER_TEST_TARGETS = \
+	$(addprefix nano-trace-replay_, $(basename $(filter-out $(EXCLUDED_TRACE_FILES), $(TRACE_FILES)))) 
+
+BATS_PLISTS_EXTRACT = \
+	$(patsubst %,$(SYMROOT)/%.plist,$(OTHER_TEST_TARGETS))
+
+EXCLUDED_SOURCES := \
+	nano_trace_replay.c
 CXX := $(shell $(XCRUN) -sdk "$(TARGETSDK)" -find clang++)
 
+WARNING_CFLAGS := -Wno-format-invalid-specifier -Wno-format-extra-args
 OTHER_CFLAGS += \
 	-DDARWINTEST \
+	-DOS_ATOMIC_CONFIG_MEMORY_ORDER_DEPENDENCY=1 \
 	-DOS_UNFAIR_LOCK_INLINE=1 \
+	-DT_META_TAG_XZONE=T_META_TAG\(\"xzone\"\) \
+	-DT_META_TAG_XZONE_ONLY=T_META_TAG\(\"xzone_only\"\) \
+	-fno-builtin \
+	-fno-typed-memory-operations \
 	-lCrashReporterClient \
 	-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders \
-	-I$(SRCROOT)/../include/malloc
+	-I$(SRCROOT)/../private \
+	-I$(SRCROOT)/../include \
+	$(WARNING_CFLAGS)
 
-$(OBJROOT)/MallocBench/%.o: MallocBench/%.cpp
-	@mkdir -p $(OBJROOT)/MallocBench
-	$(CXX) $(CFLAGS) -I$(SRCROOT)/MallocBench -std=gnu++11 -stdlib=libc++ -c -o $@ $<
+PRIVATE_FRAMEWORKS = $(SDKROOT)/System/Library/PrivateFrameworks
+PERFDATA_FRAMEWORK = perfdata
 
-single-%: $(addprefix $(OBJROOT)/, $(MALLOCBENCH_SOURCE:.cpp=.o))
-	$(CXX) -c -o $(OBJROOT)/MallocBench-$@.o \
-		-I$(SRCROOT)/MallocBench \
-		$(CFLAGS) \
-		-DBENCHMARK_NAME=\"$*\" \
-		-DPARALLEL=false \
-		$(SRCROOT)/MallocBench.cpp
-	$(CXX) -o $(SYMROOT)/$@ \
-		$(CFLAGS) \
-		$^ \
-		$(OBJROOT)/MallocBench-$@.o
+nano-trace-replay_%: $(SRCROOT)/nano_trace_replay.c
+	$(CC) \
+		$(CFLAGS) $(DT_CFLAGS) $(OTHER_CFLAGS) \
+		$(LDFLAGS) $(DT_LDFLAGS) $(OTHER_LDFLAGS) \
+		-DTRACE_NAME="$(patsubst nano-trace-replay_%,%,$(notdir $@))" \
+		$(patsubst _Photos_puja,-DTEST_TIMEOUT=3000,$(findstring _Photos_puja,$(notdir $@))) \
+		-o $@ \
+		$(SRCROOT)/nano_trace_replay.c
 
-parallel-%: $(addprefix $(OBJROOT)/, $(MALLOCBENCH_SOURCE:.cpp=.o))
-	$(CXX) -c -o $(OBJROOT)/MallocBench-$@.o \
-		-I$(SRCROOT)/MallocBench \
-		$(CFLAGS) \
-		-DBENCHMARK_NAME=\"$*\" \
-		-DPARALLEL=true \
-		$(SRCROOT)/MallocBench.cpp
-	$(CXX) -o $(SYMROOT)/$@ \
-		$(CFLAGS) \
-		$^ \
-		$(OBJROOT)/MallocBench-$@.o
+BATS_PLISTS = $(BATS_PLISTS_EXTRACT)
+BATS_PLISTS += $(PROJECT_DIR)/tests/xctests/BATS.plist
 
-OTHER_TEST_TARGETS = \
-	single-churn \
-	single-list_allocate \
-	single-tree_allocate \
-	single-tree_churn \
-	single-fragment \
-	single-fragment_iterate \
-	single-message_one \
-	single-message_many \
-	parallel-churn \
-	parallel-list_allocate \
-	parallel-tree_allocate \
-	parallel-tree_churn \
-	parallel-fragment \
-	parallel-fragment_iterate
+$(BATS_PLISTS_EXTRACT): %.plist : %
+	$(EXTRACTMETA) extract -i /$(INSTALLPATH)/$(notdir $<) -b $(SYMROOT)/$(notdir $<) -o $@
+	@plutil -convert binary1 $@
 
-#	single-medium \
-#	single-big \
-#	parallel-medium \
-#	parallel-big
-
-SANITIZER_DYLIB_PATH := /usr/local/lib/sanitizers/
+SANITIZER_DYLIB_PATH := /usr/appleinternal/lib/sanitizers/
 asan: OTHER_CFLAGS += -fsanitize=address
 asan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(SANITIZER_DYLIB_PATH)
 
@@ -76,9 +67,46 @@
 EXCLUDED_SOURCES += tsan.c
 endif
 
+bounds_test: OTHER_CFLAGS += -fbounds-attributes
+
+malloc_msl: OTHER_CFLAGS += -F $(PRIVATE_FRAMEWORKS)
+malloc_msl: OTHER_CFLAGS += -framework MallocStackLogging
+malloc_msl: OTHER_LDFLAGS += -F $(PRIVATE_FRAMEWORKS)
+malloc_msl: OTHER_LDFLAGS += -framework MallocStackLogging
+
+malloc_with_options_test: OTHER_LDFLAGS += -F $(PRIVATE_FRAMEWORKS)
+malloc_with_options_test: OTHER_LDFLAGS += -framework ktrace
+malloc_with_options_test: OTHER_CFLAGS += -I../src
+
 madvise: OTHER_CFLAGS += -I../src
-stack_logging_test: OTHER_CFLAGS += -I../private
-radix_tree_test: OTHER_CFLAGS += -I../src -framework Foundation
+malloc_claimed_address_tests: OTHER_CFLAGS += -I../src
+scribble_tests: OTHER_CFLAGS += -I../src
+malloc_size_test: OTHER_CFLAGS += -I../src
+
+xzone: OTHER_LDFLAGS += -ldarwintest_utils
+
+malloc_type: OTHER_CFLAGS += -ftyped-memory-operations
+
+EXCLUDED_SOURCES += malloc_type_callsite_cpp.cpp
+
+malloc_type_callsite_cpp.o: malloc_type_callsite_cpp.cpp
+	$(CXX) $(OTHER_CXXFLAGS) $(CXXFLAGS) -fno-typed-memory-operations -fno-typed-cxx-new-delete -c $< -o $(SYMROOT)/$@
+
+malloc_type_callsite: malloc_type_callsite_cpp.o
+malloc_type_callsite: OTHER_CFLAGS += $(SYMROOT)/malloc_type_callsite_cpp.o
+malloc_type_callsite: OTHER_LDFLAGS += -lc++
+
+# BATS test plist handling
+#  - Modify plist (add tests) to run general tests again with xzone malloc enabled
+project_test_configs: bats.plist
+	cp ./libmalloc_pgm.plist $(DSTROOT)/AppleInternal/CoreOS/BATS/unit_tests/
+	xcrun -sdk $(SDKROOT) python3 ./add_xzone_tests.py $(SYMROOT)/bats.plist --platform $(PLATFORM)
+
+.PHONY: project_test_configs
+
+# Ensure that we add the xzone tests before bats.plist is installed to the
+# dstroot
+install: project_test_configs
 
 .DEFAULT_GOAL := all