3 files changed, 9 insertions, 74 deletions
diff --git a/tests/shared-ptr/buildfile b/tests/shared-ptr/buildfile
index 8fb72ed..b5e70c7 100644
--- a/tests/shared-ptr/buildfile
+++ b/tests/shared-ptr/buildfile
@@ -1,5 +1,4 @@
 # file      : tests/shared-ptr/buildfile
-# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
 import libs = libcutl%lib{cutl}
diff --git a/tests/shared-ptr/driver.cxx b/tests/shared-ptr/driver.cxx
index fd8d7f2..d0c7f8b 100644
--- a/tests/shared-ptr/driver.cxx
+++ b/tests/shared-ptr/driver.cxx
@@ -1,11 +1,12 @@
 // file      : tests/shared-ptr/driver.cxx
-// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
 #include <string>
-#include <cassert>
 
-#include <cutl/shared-ptr.hxx>
+#include <libcutl/shared-ptr.hxx>
+
+#undef NDEBUG
+#include <cassert>
 
 using namespace cutl;
 
@@ -98,7 +99,11 @@ main ()
   // Error handling. This can theoretically can segfault and it trips up
   // the address sanitizer.
   //
-#ifndef __SANITIZE_ADDRESS__
+  // @@ This now also trips Clang 16 on various platforms, so disable for
+  //    now.
+  //
+#if 0
+//#ifndef __SANITIZE_ADDRESS__
   {
     type* x (new type (5, "foo"));
 
diff --git a/tests/shared-ptr/makefile b/tests/shared-ptr/makefile
deleted file mode 100644
index 34057c9..0000000
--- a/tests/shared-ptr/makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# file      : tests/shared-ptr/makefile
-# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC
-# license   : MIT; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-
-#
-#
-cxx_obj  := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o))
-cxx_od   := $(cxx_obj:.o=.o.d)
-
-cutl.l             := $(out_root)/cutl/cutl.l
-cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options
-
-driver   := $(out_base)/driver
-test     := $(out_base)/.test
-clean    := $(out_base)/.clean
-
-# Build.
-#
-$(driver): $(cxx_obj) $(cutl.l)
-$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options)
-
-
-$(call include-dep,$(cxx_od))
-
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-$(test): $(driver)
-	$(call message,test $<,$<)
-
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))
-
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-
-# How to.
-#
-$(call include,$(bld_root)/cxx/o-e.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/cxx-d.make)
-
-# Dependencies.
-#
-$(call import,$(src_root)/cutl/makefile)