tests/unit: Remove urcu-signal unit tests

In preparation for deprecation of the urcu-signal flavor, remove the
urcu-signal unit tests.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ic74dd38d111e320cfd2860c2fc0fdb7ffde114dd

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index cf882809e064f48d91817baae8bfcc4a9dec18f1..5884ccbe0dcb9c2c62ff6e396b1bb70e6fe64628 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -74,7 +74,6 @@ URCU_COMMON_LIB=$(top_builddir)/src/liburcu-common.la
 URCU_LIB=$(top_builddir)/src/liburcu.la
 URCU_QSBR_LIB=$(top_builddir)/src/liburcu-qsbr.la
 URCU_MB_LIB=$(top_builddir)/src/liburcu-mb.la
-URCU_SIGNAL_LIB=$(top_builddir)/src/liburcu-signal.la
 URCU_BP_LIB=$(top_builddir)/src/liburcu-bp.la
 URCU_CDS_LIB=$(top_builddir)/src/liburcu-cds.la
 TAP_LIB=$(top_builddir)/tests/utils/libtap.a
@@ -111,58 +110,54 @@ test_uatomic_cxx_LDADD = $(URCU_COMMON_LIB) $(TAP_LIB)
 test_urcu_multiflavor_SOURCES = test_urcu_multiflavor.c \
        test_urcu_multiflavor-memb.c \
        test_urcu_multiflavor-mb.c \
-       test_urcu_multiflavor-signal.c \
        test_urcu_multiflavor-qsbr.c \
        test_urcu_multiflavor-bp.c
 test_urcu_multiflavor_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
-       $(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+       $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
 test_urcu_multiflavor_cxx_SOURCES = test_urcu_multiflavor_cxx.cpp \
        test_urcu_multiflavor-memb_cxx.cpp \
        test_urcu_multiflavor-mb_cxx.cpp \
-       test_urcu_multiflavor-signal_cxx.cpp \
        test_urcu_multiflavor-qsbr_cxx.cpp \
        test_urcu_multiflavor-bp_cxx.cpp
 test_urcu_multiflavor_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
-       $(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+       $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
 test_urcu_multiflavor_dynlink_SOURCES = test_urcu_multiflavor.c \
        test_urcu_multiflavor-memb.c \
        test_urcu_multiflavor-mb.c \
-       test_urcu_multiflavor-signal.c \
        test_urcu_multiflavor-qsbr.c \
        test_urcu_multiflavor-bp.c
 test_urcu_multiflavor_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
 test_urcu_multiflavor_dynlink_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
-       $(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+       $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
 test_urcu_multiflavor_dynlink_cxx_SOURCES = test_urcu_multiflavor_cxx.cpp \
        test_urcu_multiflavor-memb_cxx.cpp \
        test_urcu_multiflavor-mb_cxx.cpp \
-       test_urcu_multiflavor-signal_cxx.cpp \
        test_urcu_multiflavor-qsbr_cxx.cpp \
        test_urcu_multiflavor-bp_cxx.cpp
 test_urcu_multiflavor_dynlink_cxx_CXXFLAGS = -DDYNAMIC_LINK_TEST $(AM_CXXFLAGS)
 test_urcu_multiflavor_dynlink_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
-       $(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+       $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
 test_urcu_multiflavor_single_unit_SOURCES = test_urcu_multiflavor_single_unit.c
 test_urcu_multiflavor_single_unit_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
-       $(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+       $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
 test_urcu_multiflavor_single_unit_cxx_SOURCES = test_urcu_multiflavor_single_unit_cxx.cpp
 test_urcu_multiflavor_single_unit_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
-       $(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+       $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
 test_urcu_multiflavor_single_unit_dynlink_SOURCES = test_urcu_multiflavor_single_unit.c
 test_urcu_multiflavor_single_unit_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
 test_urcu_multiflavor_single_unit_dynlink_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
-       $(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+       $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
 test_urcu_multiflavor_single_unit_dynlink_cxx_SOURCES = test_urcu_multiflavor_single_unit_cxx.cpp
 test_urcu_multiflavor_single_unit_dynlink_cxx_CXXFLAGS = -DDYNAMIC_LINK_TEST $(AM_CXXFLAGS)
 test_urcu_multiflavor_single_unit_dynlink_cxx_LDADD = $(URCU_LIB) $(URCU_MB_LIB) \
-       $(URCU_SIGNAL_LIB) $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
+       $(URCU_QSBR_LIB) $(URCU_BP_LIB) $(TAP_LIB)
 
 test_build_SOURCES = \
        test_build.c

diff --git a/tests/unit/test_build.c b/tests/unit/test_build.c
index d3c20351bdc7e410d02fd2f03f3254f390b8c931..99ddbcdd2ac4b9dfa3f84a563e5fa3eb90c0cdea 100644 (file)
--- a/tests/unit/test_build.c
+++ b/tests/unit/test_build.c
@@ -38,7 +38,6 @@
 #include <urcu/urcu-mb.h>
 #include <urcu/urcu-memb.h>
 #include <urcu/urcu-qsbr.h>
-#include <urcu/urcu-signal.h>
 #include <urcu/wfcqueue.h>
 #include <urcu/wfqueue.h>
 #include <urcu/wfstack.h>

diff --git a/tests/unit/test_urcu_multiflavor-bp.c b/tests/unit/test_urcu_multiflavor-bp.c
index 1d174e43deb809b675dd141f5bc6667d31a97662..460cfa6129afb4831529b719031463a62dce4c09 100644 (file)
--- a/tests/unit/test_urcu_multiflavor-bp.c
+++ b/tests/unit/test_urcu_multiflavor-bp.c
@@ -10,7 +10,6 @@
 #define _LGPL_SOURCE
 #endif
 
-#define RCU_SIGNAL
 #include <urcu-bp.h>
 #include "test_urcu_multiflavor.h"
 

diff --git a/tests/unit/test_urcu_multiflavor-signal.c b/tests/unit/test_urcu_multiflavor-signal.c
deleted file mode 100644 (file)
index 4cfb72e..0000000
--- a/tests/unit/test_urcu_multiflavor-signal.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: 2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*
- * Userspace RCU library - test multiple RCU flavors into one program
- */
-
-#ifndef DYNAMIC_LINK_TEST
-#define _LGPL_SOURCE
-#endif
-
-#define RCU_SIGNAL
-#include <urcu.h>
-#include "test_urcu_multiflavor.h"
-
-int test_mf_signal(void)
-{
-       rcu_register_thread();
-       rcu_read_lock();
-       rcu_read_unlock();
-       synchronize_rcu();
-       rcu_unregister_thread();
-       return 0;
-}

diff --git a/tests/unit/test_urcu_multiflavor-signal_cxx.cpp b/tests/unit/test_urcu_multiflavor-signal_cxx.cpp
deleted file mode 100644 (file)
index db5c79f..0000000
--- a/tests/unit/test_urcu_multiflavor-signal_cxx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-FileCopyrightText: 2023 EfficiOS Inc.
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "test_urcu_multiflavor-signal.c"

diff --git a/tests/unit/test_urcu_multiflavor.c b/tests/unit/test_urcu_multiflavor.c
index b012fbc315da0d3de9ddcc9fd791de6599e99471..ef7605a1d90c0a47efc7b51d65ff0b41ddb351ed 100644 (file)
--- a/tests/unit/test_urcu_multiflavor.c
+++ b/tests/unit/test_urcu_multiflavor.c
@@ -13,12 +13,11 @@
 
 int main(void)
 {
-       plan_tests(5);
+       plan_tests(4);
 
        ok1(!test_mf_memb());
 
        ok1(!test_mf_mb());
-       ok1(!test_mf_signal());
        ok1(!test_mf_qsbr());
        ok1(!test_mf_bp());
 

diff --git a/tests/unit/test_urcu_multiflavor.h b/tests/unit/test_urcu_multiflavor.h
index d1ce0e6771ac17a553a1e0296677e06bff157714..27e59f0de65fa42a7f1e65ae6a10888226208d98 100644 (file)
--- a/tests/unit/test_urcu_multiflavor.h
+++ b/tests/unit/test_urcu_multiflavor.h
@@ -9,7 +9,6 @@
 
 extern int test_mf_memb(void);
 extern int test_mf_mb(void);
-extern int test_mf_signal(void);
 extern int test_mf_qsbr(void);
 extern int test_mf_bp(void);
 

diff --git a/tests/unit/test_urcu_multiflavor_single_unit.c b/tests/unit/test_urcu_multiflavor_single_unit.c
index 98f0fd6c53dba87d3b3dc09bd92e809b84b6fed6..5548744e2f6ea4bfb75de28ee9566c552e8c62a7 100644 (file)
--- a/tests/unit/test_urcu_multiflavor_single_unit.c
+++ b/tests/unit/test_urcu_multiflavor_single_unit.c
@@ -13,7 +13,6 @@
 #include <urcu/urcu-mb.h>
 #include <urcu/urcu-bp.h>
 #include <urcu/urcu-memb.h>
-#include <urcu/urcu-signal.h>
 #include <urcu/urcu-qsbr.h>
 
 #include <stdlib.h>
@@ -49,16 +48,6 @@ static int test_mf_memb(void)
        return 0;
 }
 
-static int test_mf_signal(void)
-{
-       urcu_signal_register_thread();
-       urcu_signal_read_lock();
-       urcu_signal_read_unlock();
-       urcu_signal_synchronize_rcu();
-       urcu_signal_unregister_thread();
-       return 0;
-}
-
 static int test_mf_qsbr(void)
 {
        urcu_qsbr_register_thread();
@@ -71,12 +60,11 @@ static int test_mf_qsbr(void)
 
 int main(void)
 {
-       plan_tests(5);
+       plan_tests(4);
 
        ok1(!test_mf_mb());
        ok1(!test_mf_bp());
        ok1(!test_mf_memb());
-       ok1(!test_mf_signal());
        ok1(!test_mf_qsbr());
 
        return exit_status();