From 1c63701ecc8a1cff6979bdb3688cf62f4cc267f5 Mon Sep 17 00:00:00 2001 From: haller Date: Mon, 28 Nov 2005 16:24:57 +0000 Subject: Quelques modifs dans l'A/A * Rapatriement des test dans src * Ajout d'un test pipo pour errno_exception --- i/simulotron/Makefile.am | 2 +- i/simulotron/configure.ac | 4 ++-- i/simulotron/src/Makefile.am | 9 +++++++-- i/simulotron/src/socket/Makefile.am | 8 ++++++++ i/simulotron/src/socket/test_socket.cc | 5 +++++ i/simulotron/src/utils/Makefile.am | 5 +++++ i/simulotron/src/utils/test_errno_exception.cc | 5 +++++ i/simulotron/test/Makefile.am | 2 -- i/simulotron/test/socket/Makefile.am | 7 ------- i/simulotron/test/socket/testsocket.cc | 5 ----- 10 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 i/simulotron/src/socket/Makefile.am create mode 100644 i/simulotron/src/socket/test_socket.cc create mode 100644 i/simulotron/src/utils/Makefile.am create mode 100644 i/simulotron/src/utils/test_errno_exception.cc delete mode 100644 i/simulotron/test/Makefile.am delete mode 100644 i/simulotron/test/socket/Makefile.am delete mode 100644 i/simulotron/test/socket/testsocket.cc (limited to 'i') diff --git a/i/simulotron/Makefile.am b/i/simulotron/Makefile.am index f4166ba..b82c095 100644 --- a/i/simulotron/Makefile.am +++ b/i/simulotron/Makefile.am @@ -1 +1 @@ -SUBDIRS=src test doc +SUBDIRS=src doc diff --git a/i/simulotron/configure.ac b/i/simulotron/configure.ac index 2936c96..49ac34e 100644 --- a/i/simulotron/configure.ac +++ b/i/simulotron/configure.ac @@ -28,6 +28,6 @@ AC_CHECK_FUNCS([socket]) AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile - test/Makefile - test/socket/Makefile]) + src/utils/Makefile + src/socket/Makefile]) AC_OUTPUT diff --git a/i/simulotron/src/Makefile.am b/i/simulotron/src/Makefile.am index 7302a68..3a767e2 100644 --- a/i/simulotron/src/Makefile.am +++ b/i/simulotron/src/Makefile.am @@ -1,9 +1,14 @@ +SUBDIRS = utils socket + bin_PROGRAMS = simulotron simulotron_SOURCES = main.cc \ - socket/socket.cc socket/socket.hh \ - socket/address.cc socket/address.hh \ + socket/address.hh socket/address.cc \ + socket/socket.cc socket/socket.hh \ utils/errno_exception.hh simulotron_CXXFLAGS = -g -Wall -fmessage-length=0 simulotron_LDADD = INCLUDES = -I../../src + +TESTS = socket/test_socket \ + utils/test_errno_exception diff --git a/i/simulotron/src/socket/Makefile.am b/i/simulotron/src/socket/Makefile.am new file mode 100644 index 0000000..f4ff19b --- /dev/null +++ b/i/simulotron/src/socket/Makefile.am @@ -0,0 +1,8 @@ +check_PROGRAMS = test_socket +test_socket_SOURCES = test_socket.cc \ + socket.cc socket.hh \ + address.cc address.hh \ + ../utils/errno_exception.hh + +AM_CXXFLAGS=-g -W -Wall -fmessage-length=0 +INCLUDES= -I../../src diff --git a/i/simulotron/src/socket/test_socket.cc b/i/simulotron/src/socket/test_socket.cc new file mode 100644 index 0000000..2992206 --- /dev/null +++ b/i/simulotron/src/socket/test_socket.cc @@ -0,0 +1,5 @@ + +int main(void) +{ + return 0; +} diff --git a/i/simulotron/src/utils/Makefile.am b/i/simulotron/src/utils/Makefile.am new file mode 100644 index 0000000..6bd6053 --- /dev/null +++ b/i/simulotron/src/utils/Makefile.am @@ -0,0 +1,5 @@ +check_PROGRAMS = test_errno_exception +test_errno_exception_SOURCES = errno_exception.hh test_errno_exception.cc + +AM_CXXFLAGS=-g -W -Wall -fmessage-length=0 +INCLUDES= -I../../src diff --git a/i/simulotron/src/utils/test_errno_exception.cc b/i/simulotron/src/utils/test_errno_exception.cc new file mode 100644 index 0000000..2992206 --- /dev/null +++ b/i/simulotron/src/utils/test_errno_exception.cc @@ -0,0 +1,5 @@ + +int main(void) +{ + return 0; +} diff --git a/i/simulotron/test/Makefile.am b/i/simulotron/test/Makefile.am deleted file mode 100644 index d4e15a5..0000000 --- a/i/simulotron/test/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = socket -TESTS = socket/testsocket diff --git a/i/simulotron/test/socket/Makefile.am b/i/simulotron/test/socket/Makefile.am deleted file mode 100644 index f1c3892..0000000 --- a/i/simulotron/test/socket/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -check_PROGRAMS = testsocket -testsocket_SOURCES = testsocket.cc \ - ../../src/socket/socket.cc ../../src/socket/socket.hh \ - ../../src/socket/address.cc ../../src/socket/address.hh \ - ../../src/utils/errno_exception.hh -AM_CXXFLAGS=-g -W -Wall -fmessage-length=0 -INCLUDES= -I../../src diff --git a/i/simulotron/test/socket/testsocket.cc b/i/simulotron/test/socket/testsocket.cc deleted file mode 100644 index 2992206..0000000 --- a/i/simulotron/test/socket/testsocket.cc +++ /dev/null @@ -1,5 +0,0 @@ - -int main(void) -{ - return 0; -} -- cgit v1.2.3