Skip to content

Commit e2df99f

Browse files
stgekestgeke
committed
Update all tests to new header file
1 parent 6cf3487 commit e2df99f

22 files changed

+40
-327
lines changed

‎.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ env:
1616
- TEST=findpts_local_test NP=2
1717
- TEST=findpts_test NP=2
1818
- TEST=gs_test NP=2
19-
- TEST=gs_test_old NP=2
2019
- TEST=gs_test_gop_nonblocking NP=2
2120
- TEST=gs_test_gop_blocking NP=2
2221
- TEST=gs_unique_test NP=2

‎Makefile

+7-10
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ ifneq (0,$(NBC))
6363
endif
6464

6565
ifeq (0,$(BLAS))
66-
G+=-DUSE_NAIVE_BLAS
66+
SN=USE_NAIVE_BLAS
67+
G:=$(G) -D$(SN)
68+
$(shell printf "#ifndef ${SN}\n#define ${SN}\n#endif\n" >>config.h)
6769
endif
6870

6971
ifeq (1,$(BLAS))
@@ -78,14 +80,11 @@ endif
7880
CCCMD=$(CC) $(CFLAGS) -I$(INCDIR) $(G)
7981
FCCMD=$(FC) $(FFLAGS) -I$(INCDIR) $(G)
8082

81-
LINKCMD=$(CC) $(CFLAGS) -I$(INCDIR) $(G) $^ -o $@ -L$(SRCDIR) \
82-
-l$(LIBNAME) -lm $(LDFLAGS)
83-
8483
TESTS=$(TESTDIR)/sort_test $(TESTDIR)/sort_test2 $(TESTDIR)/sarray_sort_test \
8584
$(TESTDIR)/comm_test $(TESTDIR)/crystal_test \
8685
$(TESTDIR)/sarray_transfer_test $(TESTDIR)/gs_test \
8786
$(TESTDIR)/gs_test_gop_blocking $(TESTDIR)/gs_test_gop_nonblocking \
88-
$(TESTDIR)/gs_unique_test $(TESTDIR)/gs_test_old \
87+
$(TESTDIR)/gs_unique_test \
8988
$(TESTDIR)/findpts_el_2_test \
9089
$(TESTDIR)/findpts_el_2_test2 $(TESTDIR)/findpts_el_3_test \
9190
$(TESTDIR)/findpts_el_3_test2 $(TESTDIR)/findpts_local_test \
@@ -122,12 +121,10 @@ tests: $(TESTS)
122121

123122
clean: ; @$(RM) config.h $(SRCDIR)/*.o $(SRCDIR)/*.s $(SRCDIR)/*.a $(TESTDIR)/*.o $(FTESTDIR)/*.o $(TESTS)
124123

125-
cmds: ; @echo CC = $(CCCMD); echo LINK = $(LINKCMD);
126-
127-
$(TESTS): % : %.o | lib
128-
$(LINKCMD)
124+
$(TESTS): % : %.c | lib install
125+
$(CC) $(CFLAGS) -I$(INSTALL_ROOT)/include $< -o $@ -L$(INSTALL_ROOT)/lib -l$(LIBNAME) -lm $(LDFLAGS)
129126

130-
$(FTESTS): % : %.o | lib
127+
$(FTESTS): % : %.o | lib install
131128
$(FCCMD) $^ -o $@ -L$(SRCDIR) -l$(LIBNAME)
132129

133130
%.o: %.c ; $(CCCMD) -c $< -o $@

‎src/gslib.h

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef GSLIB_H
2+
#define GSLIB_H
3+
14
#include <stdio.h>
25
#include <stddef.h>
36
#include <stdlib.h>
@@ -19,6 +22,15 @@ extern "C" {
1922
#include "sort.h"
2023
#include "sarray_sort.h"
2124
#include "sarray_transfer.h"
25+
#include "tensor.h"
26+
#include "poly.h"
27+
#include "lob_bnd.h"
28+
#include "obbox.h"
29+
#include "findpts.h"
30+
#include "findpts_el.h"
31+
#include "findpts_local.h"
2232
#ifdef __cplusplus
2333
}
2434
#endif
35+
36+
#endif

‎tests/comm_test.c

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
#include <stddef.h>
2-
#include <stdlib.h>
3-
#include <stdio.h>
4-
#include "name.h"
5-
#include "fail.h"
6-
#include "types.h"
7-
#include "gs_defs.h"
8-
#include "comm.h"
1+
#include "gslib.h"
92

103
int main(int narg, char *arg[])
114
{

‎tests/crystal_test.c

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
1-
#include <stddef.h>
2-
#include <stdlib.h>
3-
#include <stdio.h>
4-
#include <string.h>
5-
#include "c99.h"
6-
#include "name.h"
7-
#include "fail.h"
8-
#include "types.h"
9-
#include "comm.h"
10-
#include "mem.h"
11-
#include "crystal.h"
1+
#include "gslib.h"
122

133
int main(int narg, char *arg[])
144
{

‎tests/findpts_el_2_test.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
#include <float.h>
55
#include <math.h>
66
#include <string.h>
7-
#include "c99.h"
8-
#include "name.h"
9-
#include "types.h"
10-
#include "fail.h"
11-
#include "mem.h"
12-
#include "poly.h"
13-
#include "findpts_el.h"
7+
#include "gslib.h"
148

159
#define NR 14
1610
#define NS 7

‎tests/findpts_el_2_test2.c

+1-10
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@
44
#include <math.h>
55
#include <float.h>
66
#include <string.h>
7-
#include "c99.h"
8-
#include "types.h"
9-
#include "name.h"
10-
#include "fail.h"
11-
#include "mem.h"
12-
#include "tensor.h"
13-
#include "poly.h"
14-
#include "lob_bnd.h"
15-
#include "obbox.h"
16-
#include "findpts_el.h"
7+
#include "gslib.h"
178
#include "rand_elt_test.h"
189

1910
#define REPEAT 10000

‎tests/findpts_el_3_test.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
#include <float.h>
55
#include <math.h>
66
#include <string.h>
7-
#include "c99.h"
8-
#include "name.h"
9-
#include "types.h"
10-
#include "fail.h"
11-
#include "mem.h"
12-
#include "poly.h"
13-
#include "findpts_el.h"
7+
#include "gslib.h"
148

159
#define NR 14
1610
#define NS 7

‎tests/findpts_el_3_test2.c

+1-10
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@
44
#include <math.h>
55
#include <float.h>
66
#include <string.h>
7-
#include "c99.h"
8-
#include "types.h"
9-
#include "name.h"
10-
#include "fail.h"
11-
#include "mem.h"
12-
#include "tensor.h"
13-
#include "poly.h"
14-
#include "lob_bnd.h"
15-
#include "obbox.h"
16-
#include "findpts_el.h"
7+
#include "gslib.h"
178
#include "rand_elt_test.h"
189

1910
#define REPEAT 100

‎tests/findpts_local_test.c

+1-10
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@
44
#include <float.h>
55
#include <math.h>
66
#include <string.h>
7-
#include "c99.h"
8-
#include "name.h"
9-
#include "fail.h"
10-
#include "mem.h"
11-
#include "types.h"
12-
#include "poly.h"
13-
#include "obbox.h"
14-
#include "findpts_el.h"
15-
#include "findpts_local.h"
16-
#include "lob_bnd.h"
7+
#include "gslib.h"
178
#include "rand_elt_test.h"
189

1910
#define D 3

‎tests/findpts_test.c

+1-12
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,8 @@
44
#include <string.h>
55
#include <float.h>
66
#include <math.h>
7-
#include "c99.h"
8-
#include "name.h"
9-
#include "fail.h"
10-
#include "types.h"
11-
#include "mem.h"
12-
#include "poly.h"
13-
#include "gs_defs.h"
14-
#include "comm.h"
15-
#include "lob_bnd.h"
7+
#include "gslib.h"
168
#include "rand_elt_test.h"
17-
#include "findpts.h"
18-
#include "crystal.h"
19-
#include "sarray_transfer.h"
209

2110
#define D 3
2211

‎tests/gs_test.c

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
#include <stddef.h>
2-
#include <stdlib.h>
3-
#include <stdio.h>
4-
#include <string.h>
51
#include <assert.h>
62
#include <math.h>
7-
8-
#include "c99.h"
9-
#include "name.h"
10-
#include "fail.h"
11-
#include "types.h"
12-
#include "comm.h"
13-
#include "mem.h"
14-
#include "gs_defs.h"
15-
#include "gs.h"
3+
#include "gslib.h"
164

175
typedef double T;
186
const gs_dom dom = gs_double;

‎tests/gs_test_gop_blocking.c

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
#include <stddef.h>
2-
#include <stdlib.h>
3-
#include <stdio.h>
4-
#include <string.h>
51
#include <assert.h>
6-
#include "c99.h"
7-
#include "name.h"
8-
#include "fail.h"
9-
#include "types.h"
10-
#include "comm.h"
11-
#include "mem.h"
12-
#include "gs_defs.h"
13-
#include "gs.h"
2+
#include "gslib.h"
143

154
struct gs_data *gop_handle;
165
int np;

‎tests/gs_test_gop_nonblocking.c

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
#include <stddef.h>
2-
#include <stdlib.h>
3-
#include <stdio.h>
4-
#include <string.h>
51
#include <assert.h>
6-
#include "c99.h"
7-
#include "name.h"
8-
#include "fail.h"
9-
#include "types.h"
10-
#include "comm.h"
11-
#include "mem.h"
12-
#include "gs_defs.h"
13-
#include "gs.h"
2+
#include "gslib.h"
143

154
struct gs_data *gop_handle;
165
int np;

0 commit comments

Comments
 (0)