From c2f42fbb146c04ba557ceb31a8eac9bd5f3d65ea Mon Sep 17 00:00:00 2001
From: Qunxin Liu <qxliu@google.com>
Date: Mon, 6 Nov 2023 11:49:11 -0800
Subject: [PATCH] fix meson compiled_tests

---
 src/meson.build                     | 28 ++++++++++++++--------------
 src/test-subset-instancer-solver.cc |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 5401e5df6..a2e370881 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -685,29 +685,15 @@ if get_option('tests').enabled()
   if cpp.get_define('_MSC_FULL_VER') == ''
     noinst_programs = {
       'main': 'main.cc',
-      'test-algs': ['test-algs.cc', 'hb-static.cc'],
       'test-basics': 'test.cc',
-      'test-bimap': ['test-bimap.cc', 'hb-static.cc'],
       'test-buffer-serialize': 'test-buffer-serialize.cc',
-      'test-classdef-graph': ['graph/test-classdef-graph.cc', 'hb-static.cc', 'graph/gsubgpos-context.cc'],
-      'test-instancer-solver': ['test-subset-instancer-solver.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
-      'test-iter': ['test-iter.cc', 'hb-static.cc'],
-      'test-map': ['test-map.cc', 'hb-static.cc'],
-      'test-multimap': ['test-multimap.cc', 'hb-static.cc'],
       'test-ot-meta': 'test-ot-meta.cc',
       'test-ot-name': 'test-ot-name.cc',
       'test-ot-glyphname': 'test-ot-glyphname.cc',
       'test-ot-gpos-size-params': 'test-gpos-size-params.cc',
       'test-ot-gsub-get-alternates': 'test-gsub-get-alternates.cc',
       'test-ot-gsub-would-substitute': 'test-gsub-would-substitute.cc',
-      'test-priority-queue': ['test-priority-queue.cc', 'hb-static.cc'],
-      'test-repacker': ['test-repacker.cc', 'hb-static.cc', 'graph/gsubgpos-context.cc'],
-      'test-serialize': ['test-serialize.cc', 'hb-static.cc'],
-      'test-set': ['test-set.cc', 'hb-static.cc'],
-      'test-tuple-varstore': ['test-tuple-varstore.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
-      'test-item-varstore': ['test-item-varstore.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
       'test-use-table': 'test-use-table.cc',
-      'test-vector': ['test-vector.cc', 'hb-static.cc'],
     }
     foreach name, source : noinst_programs
       executable(name, source,
@@ -720,10 +706,24 @@ if get_option('tests').enabled()
   endif
 
   compiled_tests = {
+    'test-algs': ['test-algs.cc', 'hb-static.cc'],
     'test-array': ['test-array.cc'],
+    'test-bimap': ['test-bimap.cc', 'hb-static.cc'],
+    'test-classdef-graph': ['graph/test-classdef-graph.cc', 'hb-static.cc', 'graph/gsubgpos-context.cc'],
+    'test-iter': ['test-iter.cc', 'hb-static.cc'],
     'test-machinery': ['test-machinery.cc', 'hb-static.cc'],
+    'test-map': ['test-map.cc', 'hb-static.cc'],
+    'test-multimap': ['test-multimap.cc', 'hb-static.cc'],
     'test-number': ['test-number.cc', 'hb-number.cc'],
     'test-ot-tag': ['hb-ot-tag.cc'],
+    'test-set': ['test-set.cc', 'hb-static.cc'],
+    'test-serialize': ['test-serialize.cc', 'hb-static.cc'],
+    'test-vector': ['test-vector.cc', 'hb-static.cc'],
+    'test-repacker': ['test-repacker.cc', 'hb-static.cc', 'graph/gsubgpos-context.cc'],
+    'test-instancer-solver': ['test-subset-instancer-solver.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
+    'test-priority-queue': ['test-priority-queue.cc', 'hb-static.cc'],
+    'test-tuple-varstore': ['test-tuple-varstore.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
+    'test-item-varstore': ['test-item-varstore.cc', 'hb-subset-instancer-solver.cc', 'hb-static.cc'],
     'test-unicode-ranges': ['test-unicode-ranges.cc'],
   }
   foreach name, source : compiled_tests
diff --git a/src/test-subset-instancer-solver.cc b/src/test-subset-instancer-solver.cc
index f68a7deb4..0a0aea8c2 100644
--- a/src/test-subset-instancer-solver.cc
+++ b/src/test-subset-instancer-solver.cc
@@ -419,7 +419,7 @@ main (int argc, char **argv)
     result_t out = rebase_tent (tent, axis_range, axis_distances);
     assert (out.length == 1);
     assert (out[0].first == 1.f);
-    assert (out[0].second == Triple (0.5f, 0.625f, 0.75f));
+    assert (approx (out[0].second, Triple (0.5f, 0.625f, 0.75f)));
   }
 }