From 300ca3124bacc7fc3e5b93eaad83d5a1918e23fc Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 9 Sep 2021 16:56:17 -0600
Subject: [PATCH] canvas; temporarily resurrect ConstraintPacker interactive
 tests

---
 libs/canvas/test/interactive/wscript | 36 --------------------------
 libs/canvas/wscript                  | 38 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 36 deletions(-)
 delete mode 100644 libs/canvas/test/interactive/wscript

diff --git a/libs/canvas/test/interactive/wscript b/libs/canvas/test/interactive/wscript
deleted file mode 100644
index 2c57eb2f45..0000000000
--- a/libs/canvas/test/interactive/wscript
+++ /dev/null
@@ -1,36 +0,0 @@
-# This is just a fragment, taken from the wscript two levels up in the filesystem (libs/canvas/wscript)
-    constraint_test_src = [ 'constraint_test.cc' ]
-    constraint_test = bld (features = 'cxx cxxprogram')
-    constraint_test.source = constraint_test_src
-    constraint_test.includes = obj.includes + ['../pbd', '../gtkmm2ext']
-    constraint_test.use = [ 'GTKMM', 'libcanvas', 'libgtkmm2ext' ]
-    constraint_test.name         = 'constraint_test'
-    constraint_test.target       = 'constraint_test'
-    constraint_test.install_path = ''
-
-    constraint_test2_src = [ 'constraint_test2.cc' ]
-    constraint_test2 = bld (features = 'cxx cxxprogram')
-    constraint_test2.source = constraint_test2_src
-    constraint_test2.includes = obj.includes + ['../pbd', '../gtkmm2ext']
-    constraint_test2.use = [ 'GTKMM', 'libcanvas', 'libgtkmm2ext' ]
-    constraint_test2.name         = 'constraint_test2'
-    constraint_test2.target       = 'constraint_test2'
-    constraint_test2.install_path = ''
-
-    constraint_test3_src = [ 'constraint_test3.cc' ]
-    constraint_test3 = bld (features = 'cxx cxxprogram')
-    constraint_test3.source = constraint_test3_src
-    constraint_test3.includes = obj.includes + ['../pbd', '../gtkmm2ext']
-    constraint_test3.use = [ 'GTKMM', 'libcanvas', 'libgtkmm2ext' ]
-    constraint_test3.name         = 'constraint_test3'
-    constraint_test3.target       = 'constraint_test3'
-    constraint_test3.install_path = ''
-
-    constraint_test4_src = [ 'constraint_test4.cc' ]
-    constraint_test4 = bld (features = 'cxx cxxprogram')
-    constraint_test4.source = constraint_test4_src
-    constraint_test4.includes = obj.includes + ['../pbd', '../gtkmm2ext']
-    constraint_test4.use = [ 'GTKMM', 'libcanvas', 'libgtkmm2ext' ]
-    constraint_test4.name         = 'constraint_test4'
-    constraint_test4.target       = 'constraint_test4'
-    constraint_test4.install_path = ''
diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index a71c749fb8..1ba44f02d9 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -97,6 +97,44 @@ def build(bld):
     obj.install_path = bld.env['LIBDIR']
     obj.defines      += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
 
+    # interactive (non-automated, non-cppunit) canvas tests
+    if True : # bld.env['BUILD_TESTS']:
+        constraint_test_src = [ 'test/interactive/constraint_test.cc' ]
+        constraint_test = bld (features = 'cxx cxxprogram')
+        constraint_test.source = constraint_test_src
+        constraint_test.includes = obj.includes + ['../pbd', '../gtkmm2ext']
+        constraint_test.use = [ 'GTKMM', 'libcanvas', 'libgtkmm2ext' ]
+        constraint_test.name         = 'constraint_test'
+        constraint_test.target       = 'constraint_test'
+        constraint_test.install_path = ''
+
+        constraint_test2_src = [ 'test/interactive/constraint_test2.cc' ]
+        constraint_test2 = bld (features = 'cxx cxxprogram')
+        constraint_test2.source = constraint_test2_src
+        constraint_test2.includes = obj.includes + ['../pbd', '../gtkmm2ext']
+        constraint_test2.use = [ 'GTKMM', 'libcanvas', 'libgtkmm2ext' ]
+        constraint_test2.name         = 'constraint_test2'
+        constraint_test2.target       = 'constraint_test2'
+        constraint_test2.install_path = ''
+
+        constraint_test3_src = [ 'test/interactive/constraint_test3.cc' ]
+        constraint_test3 = bld (features = 'cxx cxxprogram')
+        constraint_test3.source = constraint_test3_src
+        constraint_test3.includes = obj.includes + ['../pbd', '../gtkmm2ext']
+        constraint_test3.use = [ 'GTKMM', 'libcanvas', 'libgtkmm2ext' ]
+        constraint_test3.name         = 'constraint_test3'
+        constraint_test3.target       = 'constraint_test3'
+        constraint_test3.install_path = ''
+
+        constraint_test4_src = [ 'test/interactive/constraint_test4.cc' ]
+        constraint_test4 = bld (features = 'cxx cxxprogram')
+        constraint_test4.source = constraint_test4_src
+        constraint_test4.includes = obj.includes + ['../pbd', '../gtkmm2ext']
+        constraint_test4.use = [ 'GTKMM', 'libcanvas', 'libgtkmm2ext' ]
+        constraint_test4.name         = 'constraint_test4'
+        constraint_test4.target       = 'constraint_test4'
+        constraint_test4.install_path = ''
+    
     # canvas unit-tests are outdated
     if False and bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
             unit_testobj              = bld(features = 'cxx cxxprogram')