summaryrefslogtreecommitdiff
path: root/i
diff options
context:
space:
mode:
authorhaller2005-11-28 16:24:57 +0000
committerhaller2005-11-28 16:24:57 +0000
commit1c63701ecc8a1cff6979bdb3688cf62f4cc267f5 (patch)
tree4b2abf71fea63309c7a3d9d00def0aaa557b2462 /i
parent87e2e08ed7b47f30e458736dbfbb1ede75349d40 (diff)
Quelques modifs dans l'A/A
* Rapatriement des test dans src * Ajout d'un test pipo pour errno_exception
Diffstat (limited to 'i')
-rw-r--r--i/simulotron/Makefile.am2
-rw-r--r--i/simulotron/configure.ac4
-rw-r--r--i/simulotron/src/Makefile.am9
-rw-r--r--i/simulotron/src/socket/Makefile.am8
-rw-r--r--i/simulotron/src/socket/test_socket.cc (renamed from i/simulotron/test/socket/testsocket.cc)0
-rw-r--r--i/simulotron/src/utils/Makefile.am5
-rw-r--r--i/simulotron/src/utils/test_errno_exception.cc5
-rw-r--r--i/simulotron/test/Makefile.am2
-rw-r--r--i/simulotron/test/socket/Makefile.am7
9 files changed, 28 insertions, 14 deletions
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/test/socket/testsocket.cc b/i/simulotron/src/socket/test_socket.cc
index 2992206..2992206 100644
--- a/i/simulotron/test/socket/testsocket.cc
+++ b/i/simulotron/src/socket/test_socket.cc
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