aboutsummaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/Makefile.am22
-rw-r--r--src/tests/Makemodule.am104
-rw-r--r--src/tests/Resourcetest.cc5
-rw-r--r--src/tests/StringUtiltest.cc3
4 files changed, 104 insertions, 30 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
deleted file mode 100644
index b6678ce..0000000
--- a/src/tests/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
1AM_CPPFLAGS= -I$(top_srcdir)/src
2
3noinst_PROGRAMS= \
4 testTexture \
5 testFont \
6 testKeys \
7 testDemandAttention \
8 testFullscreen \
9 testStringUtil \
10 testRectangleUtil
11
12testTexture_SOURCES = texturetest.cc
13testFont_SOURCES = testFont.cc
14testKeys_SOURCES = testKeys.cc
15testDemandAttention_SOURCES = testDemandAttention.cc
16#testResource_SOURCES = Resourcetest.cc
17testFullscreen_SOURCES = fullscreentest.cc
18testStringUtil_SOURCES = StringUtiltest.cc
19testRectangleUtil_SOURCES = testRectangleUtil.cc
20
21LDADD=../FbTk/libFbTk.a
22
diff --git a/src/tests/Makemodule.am b/src/tests/Makemodule.am
new file mode 100644
index 0000000..4ef9a16
--- /dev/null
+++ b/src/tests/Makemodule.am
@@ -0,0 +1,104 @@
1check_PROGRAMS= \
2 testDemandAttention \
3 testFont \
4 testFullscreen \
5 testKeys \
6 testRectangleUtil \
7 testSignals \
8 testStringUtil \
9 testTexture
10
11testDemandAttention_LDFLAGS = \
12 $(FONTCONFIG_LIBS) \
13 $(FRIBIDI_LIBS) \
14 $(X11_LIBS) \
15 $(XFT_LIBS) \
16 $(XRENDER_LIBS) \
17 $(X_LIBS)
18testDemandAttention_CPPFLAGS = \
19 $(AM_CPPFLAGS) \
20 -I$(fbtk_incdir)
21testDemandAttention_SOURCES = \
22 src/tests/testDemandAttention.cc
23
24testFont_LDFLAGS = \
25 $(FONTCONFIG_LIBS) \
26 $(FRIBIDI_LIBS) \
27 $(X11_LIBS) \
28 $(XFT_LIBS) \
29 $(XRENDER_LIBS) \
30 $(X_LIBS)
31testFont_CPPFLAGS = \
32 $(AM_CPPFLAGS) \
33 -I$(fbtk_incdir)
34testFont_SOURCES = \
35 src/tests/testFont.cc
36
37testFullscreen_LDFLAGS = \
38 $(FONTCONFIG_LIBS) \
39 $(FRIBIDI_LIBS) \
40 $(X11_LIBS) \
41 $(XFT_LIBS) \
42 $(XRENDER_LIBS) \
43 $(X_LIBS)
44testFullscreen_CPPFLAGS = \
45 $(AM_CPPFLAGS) \
46 -I$(fbtk_incdir) \
47 -I$(src_incdir)
48testFullscreen_SOURCES = \
49 src/tests/fullscreentest.cc
50
51testKeys_LDFLAGS = \
52 $(FONTCONFIG_LIBS) \
53 $(FRIBIDI_LIBS) \
54 $(X11_LIBS) \
55 $(XFT_LIBS) \
56 $(XRENDER_LIBS) \
57 $(X_LIBS)
58testKeys_CPPFLAGS = \
59 $(AM_CPPFLAGS) \
60 -I$(fbtk_incdir)
61testKeys_SOURCES = \
62 src/tests/testKeys.cc
63
64testRectangleUtil_SOURCES = \
65 src/RectangleUtil.hh \
66 src/tests/testRectangleUtil.cc
67testRectangleUtil_CPPFLAGS = \
68 $(AM_CPPFLAGS) \
69 -I$(top_srcdir)/src
70
71testSignals_LDFLAGS = \
72 $(FRIBIDI_LIBS) \
73 $(X11_LIBS) \
74 $(XRENDER_LIBS) \
75 $(X_LIBS)
76
77testSignals_SOURCES = \
78 src/tests/testSignals.cc
79testSignals_CPPFLAGS = \
80 $(AM_CPPFLAGS) \
81 -I$(fbtk_incdir)
82
83testStringUtil_SOURCES = \
84 src/tests/StringUtiltest.cc
85testStringUtil_CPPFLAGS = \
86 $(AM_CPPFLAGS) \
87 -I$(fbtk_incdir)
88
89testTexture_LDFLAGS = \
90 $(FONTCONFIG_LIBS) \
91 $(FRIBIDI_LIBS) \
92 $(IMLIB2_LIBS) \
93 $(X11_LIBS) \
94 $(XFT_LIBS) \
95 $(XPM_LIBS) \
96 $(XRENDER_LIBS) \
97 $(X_LIBS)
98testTexture_SOURCES = \
99 src/tests/texturetest.cc
100testTexture_CPPFLAGS = \
101 $(AM_CPPFLAGS) \
102 -I$(fbtk_incdir)
103
104#testResource_SOURCE = Resourcetest.cc
diff --git a/src/tests/Resourcetest.cc b/src/tests/Resourcetest.cc
index 53b5ec4..a1df8d9 100644
--- a/src/tests/Resourcetest.cc
+++ b/src/tests/Resourcetest.cc
@@ -21,11 +21,6 @@
21 21
22#include "Resource.hh" 22#include "Resource.hh"
23 23
24//use of strcasecmp
25#ifndef _GNU_SOURCE
26#define _GNU_SOURCE
27#endif // _GNU_SOURCE
28
29#include <string> 24#include <string>
30#include <iostream> 25#include <iostream>
31#ifdef HAVE_CSTDIO 26#ifdef HAVE_CSTDIO
diff --git a/src/tests/StringUtiltest.cc b/src/tests/StringUtiltest.cc
index a821184..220949e 100644
--- a/src/tests/StringUtiltest.cc
+++ b/src/tests/StringUtiltest.cc
@@ -20,9 +20,6 @@
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22#include "FbTk/StringUtil.hh" 22#include "FbTk/StringUtil.hh"
23#ifndef _GNU_SOURCE
24#define _GNU_SOURCE
25#endif //_GNU_SOURCE
26 23
27#include <cstring> 24#include <cstring>
28#include <cstdlib> 25#include <cstdlib>