Fix: percpu ops mm_cid tests

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b2292ad2c588a786c0809d9ee2c4f3ab8d35773d..8ee8c1b879f1db56ae543af0a4556523697e1987 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -43,11 +43,11 @@ basic_percpu_ops_test_cxx_tap_SOURCES = basic_percpu_ops_test_cxx.cpp
 basic_percpu_ops_test_cxx_tap_LDADD = $(top_builddir)/src/librseq.la $(top_builddir)/tests/utils/libtap.la $(DL_LIBS)
 
 basic_percpu_ops_mm_cid_test_tap_SOURCES = basic_percpu_ops_test.c
-basic_percpu_ops_mm_cid_test_tap_CPPFLAGS = $(AM_CPPFLAGS) -DBUILDOPT_RSEQ_PERCPU_MM_CID_ID
+basic_percpu_ops_mm_cid_test_tap_CPPFLAGS = $(AM_CPPFLAGS) -DBUILDOPT_RSEQ_PERCPU_MM_CID
 basic_percpu_ops_mm_cid_test_tap_LDADD = $(top_builddir)/src/librseq.la $(top_builddir)/tests/utils/libtap.la $(DL_LIBS)
 
 basic_percpu_ops_mm_cid_test_cxx_tap_SOURCES = basic_percpu_ops_test_cxx.cpp
-basic_percpu_ops_mm_cid_test_cxx_tap_CPPFLAGS = $(AM_CPPFLAGS) -DBUILDOPT_RSEQ_PERCPU_MM_CID_ID
+basic_percpu_ops_mm_cid_test_cxx_tap_CPPFLAGS = $(AM_CPPFLAGS) -DBUILDOPT_RSEQ_PERCPU_MM_CID
 basic_percpu_ops_mm_cid_test_cxx_tap_LDADD = $(top_builddir)/src/librseq.la $(top_builddir)/tests/utils/libtap.la $(DL_LIBS)
 
 basic_test_tap_SOURCES = basic_test.c
@@ -105,6 +105,8 @@ param_test_mm_cid_compare_twice_cxx_LDADD = $(top_builddir)/src/librseq.la $(DL_
 TESTS = \
        basic_percpu_ops_test.tap \
        basic_percpu_ops_test_cxx.tap \
+       basic_percpu_ops_mm_cid_test.tap \
+       basic_percpu_ops_mm_cid_test_cxx.tap \
        basic_test.tap \
        basic_test_cxx.tap \
        run_param_test.tap \

diff --git a/tests/basic_percpu_ops_test.c b/tests/basic_percpu_ops_test.c
index f8b48ecdf434c8acc55e526c89a38382b1d15f75..a0fc04eb1b1d21f000e1302e1681a0045249eaad 100644 (file)
--- a/tests/basic_percpu_ops_test.c
+++ b/tests/basic_percpu_ops_test.c
@@ -348,7 +348,7 @@ int main(void)
                pass("Registered current thread with rseq");
        }
        if (!rseq_validate_cpu_id()) {
-               skip(NR_TESTS, "Error: cpu id getter unavailable");
+               skip(NR_TESTS - 1, "Error: cpu id getter unavailable");
                goto end;
        }
        test_percpu_spinlock();