From 5a9c8aad0dca20a564b06702530bf460004dfd35 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 4 Nov 2021 15:18:59 +0100 Subject: [PATCH] [buddy] execute some of the tests during "make check" * examples/bddtest/Makefile.am, src/Makefile.am (TESTS): Add this variable. * examples/bddtest/bddtest.cxx: Return non-zero on error. --- buddy/examples/bddtest/Makefile.am | 3 ++- buddy/examples/bddtest/bddtest.cxx | 22 +++++++++++++++++----- buddy/src/Makefile.am | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/buddy/examples/bddtest/Makefile.am b/buddy/examples/bddtest/Makefile.am index eb8820a5d..82a539250 100644 --- a/buddy/examples/bddtest/Makefile.am +++ b/buddy/examples/bddtest/Makefile.am @@ -1,3 +1,4 @@ include ../Makefile.def +TESTS = bddtest$(EXEEXT) check_PROGRAMS = bddtest -bddtest_SOURCES = bddtest.cxx +bddtest_SOURCES = bddtest.cxx diff --git a/buddy/examples/bddtest/bddtest.cxx b/buddy/examples/bddtest/bddtest.cxx index 3478a65bc..79d9ef85d 100644 --- a/buddy/examples/bddtest/bddtest.cxx +++ b/buddy/examples/bddtest/bddtest.cxx @@ -3,6 +3,7 @@ #include static const int varnum = 5; +static int err = 0; /************************************************************************** Example of allsat print handler. @@ -47,6 +48,7 @@ void test1_check(bdd x) { using namespace std ; double anum = bdd_satcount(x); + bool error = false; cout << "Checking bdd with " << setw(4) << anum << " assignments: "; @@ -59,15 +61,25 @@ void test1_check(bdd x) // Now the summed set should be equal to the original set if (allsatSumBDD == x) - cout << " Sum-OK. "; + { + cout << " Sum-OK. "; + } else - cout << " Sum-ERROR. "; + { + cout << " Sum-ERROR. "; + err = 1; + } // The subtracted set should be empty if (allsatBDD == bddfalse) - cout << "Sub-OK.\n"; + { + cout << "Sub-OK.\n"; + } else - cout << "Sub-ERROR.\n"; + { + cout << "Sub-ERROR.\n"; + err = 1; + } } @@ -141,5 +153,5 @@ int main() bdd_done(); - return 0; + return err; } diff --git a/buddy/src/Makefile.am b/buddy/src/Makefile.am index 5a089a93e..4da3f0a64 100644 --- a/buddy/src/Makefile.am +++ b/buddy/src/Makefile.am @@ -26,6 +26,7 @@ libbddx_la_SOURCES = \ reorder.c \ tree.c +TESTS = bddtest$(EXEEXT) check_PROGRAMS = bddtest bddtest_SOURCES = bddtest.cxx bddtest_CPPFLAGS = -I$(top_builddir)