Skip to content

Commit 2055297

Browse files
giltirngiltirn
committed
Moved a number of core unit tests to new test/core/unit_tests directories
1 parent d311446 commit 2055297

31 files changed

Lines changed: 89 additions & 82 deletions

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ AC_CONFIG_HEADERS([chimbuko_config.h])
217217
AC_SUBST([PS_FLAGS])
218218

219219
AC_CONFIG_SRCDIR([src/dummy])
220-
AC_CONFIG_FILES([Makefile src/Makefile app/Makefile sphinx/Makefile include/Makefile 3rdparty/Makefile test/Makefile test/unit_tests/Makefile test/unit_tests/ad/Makefile test/unit_tests/util/Makefile test/unit_tests/pserver/Makefile test/unit_tests/net/Makefile test/unit_tests/param/Makefile test/unit_tests/provdb/Makefile scripts/Makefile scripts/launch/Makefile sim/Makefile sim/src/Makefile sim/main/Makefile sim/include/Makefile])
220+
AC_CONFIG_FILES([Makefile src/Makefile app/Makefile sphinx/Makefile include/Makefile 3rdparty/Makefile test/Makefile test/unit_tests/Makefile test/unit_tests/ad/Makefile test/unit_tests/pserver/Makefile test/unit_tests/provdb/Makefile test/core/Makefile test/core/unit_tests/Makefile test/core/unit_tests/param/Makefile test/core/unit_tests/net/Makefile test/core/unit_tests/util/Makefile test/core/unit_tests/ad/Makefile scripts/Makefile scripts/launch/Makefile sim/Makefile sim/src/Makefile sim/main/Makefile sim/include/Makefile])
221221

222222
AC_CONFIG_FILES([app/ws_flask_stat.py:app/ws_flask_stat.py app/sst_view_parse.pl:app/sst_view_parse.pl])
223223
AC_CONFIG_FILES([run_test.sh:run_test.sh test/run_all.sh:test/run_all.sh test/run_ad.sh:test/run_ad.sh test/run_net.sh:test/run_net.sh test/run_provdb_client_test.sh:test/run_provdb_client_test.sh test/run_provdb_autoshutdown_test.sh:test/run_provdb_autoshutdown_test.sh test/unit_tests/run_all.sh:test/unit_tests/run_all.sh test/run_ad_with_provdb.sh:test/run_ad_with_provdb.sh test/run_stat_sender.sh:test/run_stat_sender.sh scripts/launch/run_services.sh:scripts/launch/run_services.sh], [chmod u+x $(echo $ac_tag | sed s/.*\://)])

‎test/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SUBDIRS = unit_tests
1+
SUBDIRS = unit_tests core
22

33
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/3rdparty @PS_FLAGS@
44
LDADD = ../src/libchimbuko.la -lgtest -lstdc++fs

‎test/core/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SUBDIRS = unit_tests

‎test/core/unit_tests/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SUBDIRS = param net util ad

test/unit_tests/ad/ADio.cpp renamed to test/core/unit_tests/ad/ADio.cpp

File renamed without changes.

‎test/core/unit_tests/ad/Makefile.am‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/3rdparty @PS_FLAGS@
2+
LDADD = $(top_builddir)/src/libchimbuko.la -lgtest -lstdc++fs
3+
4+
testdir = $(prefix)/test/core/unit_tests/ad
5+
test_PROGRAMS = ADio utils
6+
7+
ADio_SOURCES = ADio.cpp ../../../unit_tests/unit_test_main_mpi.cpp
8+
ADio_LDADD = $(LDADD)
9+
10+
utils_SOURCES = utils.cpp ../../../unit_tests/unit_test_main_mpi.cpp
11+
utils_LDADD = $(LDADD)

test/unit_tests/ad/utils.cpp renamed to test/core/unit_tests/ad/utils.cpp

File renamed without changes.

test/unit_tests/net/LocalNet.cpp renamed to test/core/unit_tests/net/LocalNet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "gtest/gtest.h"
2-
#include "../unit_test_common.hpp"
2+
#include "../../../unit_tests/unit_test_common.hpp"
33
#include <chimbuko/core/net/local_net.hpp>
44

55
using namespace chimbuko;

‎test/core/unit_tests/net/Makefile.am‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/3rdparty @PS_FLAGS@
2+
LDADD = $(top_builddir)/src/libchimbuko.la -lgtest -lstdc++fs
3+
4+
testdir = $(prefix)/test/core/unit_tests/net
5+
test_PROGRAMS = ZMQMENet ZMQNet LocalNet
6+
7+
ZMQMENet_SOURCES = ZMQMENet.cpp ../../../unit_tests/unit_test_main_mpi.cpp
8+
ZMQMENet_LDADD = $(LDADD)
9+
10+
ZMQNet_SOURCES = ZMQNet.cpp ../../../unit_tests/unit_test_main_mpi.cpp
11+
ZMQNet_LDADD = $(LDADD)
12+
13+
LocalNet_SOURCES = LocalNet.cpp ../../../unit_tests/unit_test_main_mpi.cpp
14+
LocalNet_LDADD = $(LDADD)
15+

test/unit_tests/net/ZMQMENet.cpp renamed to test/core/unit_tests/net/ZMQMENet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifdef _USE_ZMQNET
22

33
#include "gtest/gtest.h"
4-
#include "../unit_test_common.hpp"
4+
#include "../../../unit_tests/unit_test_common.hpp"
55
#include <chimbuko/core/util/barrier.hpp>
66
#include <chimbuko/core/util/string.hpp>
77
#include <chimbuko/core/net/zmqme_net.hpp>

0 commit comments

Comments
 (0)