Fix [https://github.com/tcltk/tcl/runs/2263266926|failing test-cases] with --enable-symbols=mem build by reverting the series of commits that caused the memory-leak

2 files changed, 3 insertions, 35 deletions

diff --git a/tests/namespace.test b/tests/namespace.test
index dc0e56d..efd00a8 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -3289,8 +3289,8 @@ test namespace-56.2 {bug f97d4ee020: mutually-entangled deletion} {
     namespace eval ::testing {
 	namespace eval abc {proc xyz {} {}}
 	namespace eval def {proc xyz {} {}}
-	trace add command abc::xyz delete "namespace delete ::testing::def; #"
-	trace add command def::xyz delete "namespace delete ::testing::abc; #"
+	trace add command abc::xyz delete "namespace delete ::testing::def {}; #"
+	trace add command def::xyz delete "namespace delete ::testing::abc {}; #"
     }
     namespace delete ::testing
 } {}
diff --git a/tests/oo.test b/tests/oo.test
index 7980f9e..168baee 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -1734,7 +1734,6 @@ test oo-11.6.3 {
 } -result 0 -cleanup {
 }
 
-
 test oo-11.6.4 {
     OO: cleanup ReleaseClassContents() where class is mixed into one of its
     instances
@@ -1755,34 +1754,6 @@ test oo-11.6.4 {
     rename obj1 {}
 }
 
-
-test oo-11.7 {
-    When an object is deleted its namespace is deleted, and all objects it is
-    mixed into are also deleted.  If the object has been renamed into the
-    namespace of one of the objects it has been mixed into, the routine for the
-    object might get entirely deleted before the namespace of the object is
-    entirely deleted, in which case the C routine that performs the namespace
-    deletion either must either understand that the handle on the routine for
-    the object might now be gone, or it must be guaranteed that the handle does
-    not disappear until that routine is finished.
-} -setup {
-} -body {
-    oo::class create class1
-
-    oo::object create obj1
-    oo::objdefine obj1 {
-	mixin ::class1
-    }
-    set obj1ns [info object namespace obj1]
-    set class1ns [info object namespace class1]
-    rename class1 ${obj1ns}::class1
-    # No segmentation fault
-    namespace delete $class1ns
-    return done
-} -cleanup {
-} -result done
-
-
 test oo-12.1 {OO: filters} {
     oo::class create Aclass
     Aclass create Aobject
@@ -1806,8 +1777,6 @@ test oo-12.1 {OO: filters} {
     Aclass destroy
     return $result
 } {{calling ::Aobject->logFilter 1 2 3 4 5} 1 2 3 4 5 result=12345 12345}
-
-
 test oo-12.2 {OO: filters} -setup {
     oo::class create Aclass
     Aclass create Aobject
@@ -4407,13 +4376,12 @@ test oo-35.6 {
 } -body {
     rename obj2 {}
     rename obj1 {}
-    # No segmentation fault
+    # doesn't crash
     return done
 } -cleanup {
     rename obj {}
 } -result done
 
-
 test oo-36.1 {TIP #470: introspection within oo::define} {
     oo::define oo::object self
 } ::oo::object