From ff40f7d37d37c1ca93573dbd4caa5c8c86d1a334 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Thu, 20 Jul 2023 16:11:25 -0700
Subject: [PATCH] tests: move tests to appropriate libraries

---
 src/{ => libsysprof-capture}/tests/allocs-by-size.c      | 4 ++--
 src/{ => libsysprof-capture}/tests/cross-thread-frees.c  | 4 ++--
 src/{ => libsysprof-capture}/tests/find-temp-allocs.c    | 0
 src/libsysprof-capture/tests/meson.build                 | 7 ++++++-
 src/{ => libsysprof-capture}/tests/test-capture-cursor.c | 0
 src/{ => libsysprof-capture}/tests/test-capture.c        | 0
 src/libsysprof/tests/meson.build                         | 1 +
 src/{ => libsysprof}/tests/read-build-id.c               | 0
 8 files changed, 11 insertions(+), 5 deletions(-)
 rename src/{ => libsysprof-capture}/tests/allocs-by-size.c (98%)
 rename src/{ => libsysprof-capture}/tests/cross-thread-frees.c (98%)
 rename src/{ => libsysprof-capture}/tests/find-temp-allocs.c (100%)
 rename src/{ => libsysprof-capture}/tests/test-capture-cursor.c (100%)
 rename src/{ => libsysprof-capture}/tests/test-capture.c (100%)
 rename src/{ => libsysprof}/tests/read-build-id.c (100%)

diff --git a/src/tests/allocs-by-size.c b/src/libsysprof-capture/tests/allocs-by-size.c
similarity index 98%
rename from src/tests/allocs-by-size.c
rename to src/libsysprof-capture/tests/allocs-by-size.c
index d98e0f6f..ade4eb5b 100644
--- a/src/tests/allocs-by-size.c
+++ b/src/libsysprof-capture/tests/allocs-by-size.c
@@ -24,8 +24,8 @@
 #include <glib/gi18n.h>
 #include <locale.h>
 #include <stddef.h>
-#include <rax.h>
-#include <sysprof.h>
+
+#include <sysprof-capture.h>
 
 typedef struct
 {
diff --git a/src/tests/cross-thread-frees.c b/src/libsysprof-capture/tests/cross-thread-frees.c
similarity index 98%
rename from src/tests/cross-thread-frees.c
rename to src/libsysprof-capture/tests/cross-thread-frees.c
index f931e61c..0a90a34e 100644
--- a/src/tests/cross-thread-frees.c
+++ b/src/libsysprof-capture/tests/cross-thread-frees.c
@@ -23,8 +23,8 @@
 #include <errno.h>
 #include <glib.h>
 #include <stddef.h>
-#include <rax.h>
-#include <sysprof.h>
+
+#include <sysprof-capture.h>
 
 typedef struct
 {
diff --git a/src/tests/find-temp-allocs.c b/src/libsysprof-capture/tests/find-temp-allocs.c
similarity index 100%
rename from src/tests/find-temp-allocs.c
rename to src/libsysprof-capture/tests/find-temp-allocs.c
diff --git a/src/libsysprof-capture/tests/meson.build b/src/libsysprof-capture/tests/meson.build
index b9ac267b..d5d7ddb0 100644
--- a/src/libsysprof-capture/tests/meson.build
+++ b/src/libsysprof-capture/tests/meson.build
@@ -15,8 +15,13 @@ libsysprof_capture_testsuite_c_args = [
 ]
 
 libsysprof_capture_testsuite = {
-  'test-mapped-ring-buffer' : {},
+  'allocs-by-size'          : {'skip': true},
+  'cross-thread-frees'      : {'skip': true},
+  'find-temp-allocs'        : {'skip': true},
   'rewrite-pid'             : {'skip': true},
+  'test-capture'            : {},
+  'test-capture-cursor'     : {},
+  'test-mapped-ring-buffer' : {},
 }
 
 libsysprof_capture_testsuite_deps = [
diff --git a/src/tests/test-capture-cursor.c b/src/libsysprof-capture/tests/test-capture-cursor.c
similarity index 100%
rename from src/tests/test-capture-cursor.c
rename to src/libsysprof-capture/tests/test-capture-cursor.c
diff --git a/src/tests/test-capture.c b/src/libsysprof-capture/tests/test-capture.c
similarity index 100%
rename from src/tests/test-capture.c
rename to src/libsysprof-capture/tests/test-capture.c
diff --git a/src/libsysprof/tests/meson.build b/src/libsysprof/tests/meson.build
index bcb40772..8f5b20ca 100644
--- a/src/libsysprof/tests/meson.build
+++ b/src/libsysprof/tests/meson.build
@@ -11,6 +11,7 @@ libsysprof_testsuite_c_args = [
 ]
 
 libsysprof_testsuite = {
+  'read-build-id'            : {'skip': true},
   'test-callgraph'           : {'skip': true},
   'test-capture-model'       : {'skip': true},
   'test-elf-loader'          : {'skip': true},
diff --git a/src/tests/read-build-id.c b/src/libsysprof/tests/read-build-id.c
similarity index 100%
rename from src/tests/read-build-id.c
rename to src/libsysprof/tests/read-build-id.c