diff --git a/libcxx/test/CMakeLists.txt b/libcxx/test/CMakeLists.txt
--- a/libcxx/test/CMakeLists.txt
+++ b/libcxx/test/CMakeLists.txt
@@ -46,7 +46,7 @@
 # directory.
 if (NOT LIBCXX_CXX_ABI_LIBRARY_PATH)
   set(LIBCXX_CXX_ABI_LIBRARY_PATH "${LIBCXX_LIBRARY_DIR}" CACHE PATH
-      "The path to libc++abi library.")
+      "The path to libc++abi library." FORCE)
 endif()
 
 set(LIBCXX_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
diff --git a/libcxx/utils/libcxx/test/tracing.py b/libcxx/utils/libcxx/test/tracing.py
--- a/libcxx/utils/libcxx/test/tracing.py
+++ b/libcxx/utils/libcxx/test/tracing.py
@@ -14,7 +14,7 @@
     def wrapper(*args, **kwargs):
         kwarg_strs = ['{}={}'.format(k, v) for (k, v) in kwargs]
         arg_str = ', '.join([str(a) for a in args] + kwarg_strs)
-        call_str = '{}({})'.format(function.func_name, arg_str)
+        call_str = '{}({})'.format(function.__name__, arg_str)
 
         # Perform the call itself, logging before, after, and anything thrown.
         try: