Skip to content

Commit e41dee6

Browse files
committed
Changed my mind, moved core/unit_tests to unit_tests/core
1 parent 2055297 commit e41dee6

30 files changed

Lines changed: 75 additions & 76 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/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])
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/unit_tests/core/Makefile test/unit_tests/core/param/Makefile test/unit_tests/core/net/Makefile test/unit_tests/core/util/Makefile test/unit_tests/core/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 core
1+
SUBDIRS = unit_tests
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: 0 additions & 1 deletion
This file was deleted.

test/core/unit_tests/net/Makefile.am

Lines changed: 0 additions & 15 deletions
This file was deleted.

test/core/unit_tests/param/Makefile.am

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/core/unit_tests/util/Makefile.am

Lines changed: 0 additions & 35 deletions
This file was deleted.

test/unit_tests/Makefile.am

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

33
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/3rdparty @PS_FLAGS@
44
LDADD = $(top_builddir)/src/libchimbuko.la -lgtest -lstdc++fs
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/3rdparty @PS_FLAGS@
22
LDADD = $(top_builddir)/src/libchimbuko.la -lgtest -lstdc++fs
33

4-
testdir = $(prefix)/test/core/unit_tests/ad
4+
testdir = $(prefix)/test/unit_tests/core/ad
55
test_PROGRAMS = ADio utils
66

7-
ADio_SOURCES = ADio.cpp ../../../unit_tests/unit_test_main_mpi.cpp
7+
ADio_SOURCES = ADio.cpp ../../unit_test_main_mpi.cpp
88
ADio_LDADD = $(LDADD)
99

10-
utils_SOURCES = utils.cpp ../../../unit_tests/unit_test_main_mpi.cpp
10+
utils_SOURCES = utils.cpp ../../unit_test_main_mpi.cpp
1111
utils_LDADD = $(LDADD)

0 commit comments

Comments
 (0)