Skip to content

Commit 6d94e8e

Browse files
sheftyshefty
committed
Rename simple to functional
The tests aren't really 'simply', they mostly just focus on testing a specific feature. Signed-off-by: Sean Hefty <[email protected]>
1 parent 99f69f3 commit 6d94e8e

32 files changed

+176
-176
lines changed

‎Makefile.am

+101-101
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@ os_excludes = -f ./test_configs/osx.exclude
77
endif
88

99
bin_PROGRAMS = \
10-
simple/fi_av_xfer \
11-
simple/fi_msg \
12-
simple/fi_msg_sockets \
13-
simple/fi_rdm \
14-
simple/fi_rdm_rma_simple \
15-
simple/fi_rdm_rma_trigger \
16-
simple/fi_rdm_deferred_wq \
17-
simple/fi_dgram \
18-
simple/fi_mcast \
19-
simple/fi_dgram_waitset \
20-
simple/fi_rdm_tagged_peek \
21-
simple/fi_cq_data \
22-
simple/fi_poll \
23-
simple/fi_scalable_ep \
24-
simple/fi_shared_ctx \
25-
simple/fi_msg_epoll \
26-
simple/fi_rdm_shared_av \
27-
simple/fi_cm_data \
28-
simple/fi_multi_mr \
29-
simple/fi_rdm_multi_domain \
30-
simple/fi_multi_ep \
31-
simple/fi_recv_cancel \
32-
simple/fi_unexpected_msg \
33-
simple/fi_inj_complete \
34-
simple/fi_resource_freeing \
10+
functional/fi_av_xfer \
11+
functional/fi_msg \
12+
functional/fi_msg_sockets \
13+
functional/fi_rdm \
14+
functional/fi_rdm_rma_simple \
15+
functional/fi_rdm_rma_trigger \
16+
functional/fi_rdm_deferred_wq \
17+
functional/fi_dgram \
18+
functional/fi_mcast \
19+
functional/fi_dgram_waitset \
20+
functional/fi_rdm_tagged_peek \
21+
functional/fi_cq_data \
22+
functional/fi_poll \
23+
functional/fi_scalable_ep \
24+
functional/fi_shared_ctx \
25+
functional/fi_msg_epoll \
26+
functional/fi_rdm_shared_av \
27+
functional/fi_cm_data \
28+
functional/fi_multi_mr \
29+
functional/fi_rdm_multi_domain \
30+
functional/fi_multi_ep \
31+
functional/fi_recv_cancel \
32+
functional/fi_unexpected_msg \
33+
functional/fi_inj_complete \
34+
functional/fi_resource_freeing \
3535
streaming/fi_resmgmt_test \
3636
streaming/fi_rdm_atomic \
3737
streaming/fi_rdm_multi_recv \
@@ -70,7 +70,7 @@ nobase_dist_config_DATA = \
7070
test_configs/udp/all.test \
7171
test_configs/udp/lat_bw.test \
7272
test_configs/udp/quick.test \
73-
test_configs/udp/simple.test \
73+
test_configs/udp/functional.test \
7474
test_configs/udp/udp.exclude \
7575
test_configs/verbs/all.test \
7676
test_configs/verbs/quick.test \
@@ -108,105 +108,105 @@ libfabtests_la_SOURCES += common/osx/osd.c
108108
endif
109109
endif
110110

111-
simple_fi_av_xfer_SOURCES = \
112-
simple/av_xfer.c
113-
simple_fi_av_xfer_LDADD = libfabtests.la
111+
functional_fi_av_xfer_SOURCES = \
112+
functional/av_xfer.c
113+
functional_fi_av_xfer_LDADD = libfabtests.la
114114

115-
simple_fi_msg_sockets_SOURCES = \
116-
simple/msg_sockets.c
117-
simple_fi_msg_sockets_LDADD = libfabtests.la
115+
functional_fi_msg_sockets_SOURCES = \
116+
functional/msg_sockets.c
117+
functional_fi_msg_sockets_LDADD = libfabtests.la
118118

119-
simple_fi_msg_epoll_SOURCES = \
120-
simple/msg_epoll.c
121-
simple_fi_msg_epoll_LDADD = libfabtests.la
119+
functional_fi_msg_epoll_SOURCES = \
120+
functional/msg_epoll.c
121+
functional_fi_msg_epoll_LDADD = libfabtests.la
122122

123-
simple_fi_msg_SOURCES = \
124-
simple/msg.c
125-
simple_fi_msg_LDADD = libfabtests.la
123+
functional_fi_msg_SOURCES = \
124+
functional/msg.c
125+
functional_fi_msg_LDADD = libfabtests.la
126126

127-
simple_fi_rdm_SOURCES = \
128-
simple/rdm.c
129-
simple_fi_rdm_LDADD = libfabtests.la
127+
functional_fi_rdm_SOURCES = \
128+
functional/rdm.c
129+
functional_fi_rdm_LDADD = libfabtests.la
130130

131-
simple_fi_rdm_shared_av_SOURCES = \
132-
simple/rdm_shared_av.c
133-
simple_fi_rdm_shared_av_LDADD = libfabtests.la
131+
functional_fi_rdm_shared_av_SOURCES = \
132+
functional/rdm_shared_av.c
133+
functional_fi_rdm_shared_av_LDADD = libfabtests.la
134134

135-
simple_fi_rdm_rma_simple_SOURCES = \
136-
simple/rdm_rma_simple.c
137-
simple_fi_rdm_rma_simple_LDADD = libfabtests.la
135+
functional_fi_rdm_rma_simple_SOURCES = \
136+
functional/rdm_rma_simple.c
137+
functional_fi_rdm_rma_simple_LDADD = libfabtests.la
138138

139-
simple_fi_rdm_rma_trigger_SOURCES = \
140-
simple/rdm_rma_trigger.c
141-
simple_fi_rdm_rma_trigger_LDADD = libfabtests.la
139+
functional_fi_rdm_rma_trigger_SOURCES = \
140+
functional/rdm_rma_trigger.c
141+
functional_fi_rdm_rma_trigger_LDADD = libfabtests.la
142142

143-
simple_fi_rdm_deferred_wq_SOURCES = \
144-
simple/rdm_deferred_wq.c
145-
simple_fi_rdm_deferred_wq_LDADD = libfabtests.la
143+
functional_fi_rdm_deferred_wq_SOURCES = \
144+
functional/rdm_deferred_wq.c
145+
functional_fi_rdm_deferred_wq_LDADD = libfabtests.la
146146

147-
simple_fi_dgram_SOURCES = \
148-
simple/dgram.c
149-
simple_fi_dgram_LDADD = libfabtests.la
147+
functional_fi_dgram_SOURCES = \
148+
functional/dgram.c
149+
functional_fi_dgram_LDADD = libfabtests.la
150150

151-
simple_fi_mcast_SOURCES = \
152-
simple/mcast.c
153-
simple_fi_mcast_LDADD = libfabtests.la
151+
functional_fi_mcast_SOURCES = \
152+
functional/mcast.c
153+
functional_fi_mcast_LDADD = libfabtests.la
154154

155-
simple_fi_dgram_waitset_SOURCES = \
156-
simple/dgram_waitset.c
157-
simple_fi_dgram_waitset_LDADD = libfabtests.la
155+
functional_fi_dgram_waitset_SOURCES = \
156+
functional/dgram_waitset.c
157+
functional_fi_dgram_waitset_LDADD = libfabtests.la
158158

159-
simple_fi_rdm_tagged_peek_SOURCES = \
160-
simple/rdm_tagged_peek.c
161-
simple_fi_rdm_tagged_peek_LDADD = libfabtests.la
159+
functional_fi_rdm_tagged_peek_SOURCES = \
160+
functional/rdm_tagged_peek.c
161+
functional_fi_rdm_tagged_peek_LDADD = libfabtests.la
162162

163-
simple_fi_cq_data_SOURCES = \
164-
simple/cq_data.c
165-
simple_fi_cq_data_LDADD = libfabtests.la
163+
functional_fi_cq_data_SOURCES = \
164+
functional/cq_data.c
165+
functional_fi_cq_data_LDADD = libfabtests.la
166166

167-
simple_fi_cm_data_SOURCES = \
168-
simple/cm_data.c
169-
simple_fi_cm_data_LDADD = libfabtests.la
167+
functional_fi_cm_data_SOURCES = \
168+
functional/cm_data.c
169+
functional_fi_cm_data_LDADD = libfabtests.la
170170

171-
simple_fi_scalable_ep_SOURCES = \
172-
simple/scalable_ep.c
173-
simple_fi_scalable_ep_LDADD = libfabtests.la
171+
functional_fi_scalable_ep_SOURCES = \
172+
functional/scalable_ep.c
173+
functional_fi_scalable_ep_LDADD = libfabtests.la
174174

175-
simple_fi_shared_ctx_SOURCES = \
176-
simple/shared_ctx.c
177-
simple_fi_shared_ctx_LDADD = libfabtests.la
175+
functional_fi_shared_ctx_SOURCES = \
176+
functional/shared_ctx.c
177+
functional_fi_shared_ctx_LDADD = libfabtests.la
178178

179-
simple_fi_poll_SOURCES = \
180-
simple/poll.c
181-
simple_fi_poll_LDADD = libfabtests.la
179+
functional_fi_poll_SOURCES = \
180+
functional/poll.c
181+
functional_fi_poll_LDADD = libfabtests.la
182182

183-
simple_fi_multi_ep_SOURCES = \
184-
simple/multi_ep.c
185-
simple_fi_multi_ep_LDADD = libfabtests.la
183+
functional_fi_multi_ep_SOURCES = \
184+
functional/multi_ep.c
185+
functional_fi_multi_ep_LDADD = libfabtests.la
186186

187-
simple_fi_multi_mr_SOURCES = \
188-
simple/multi_mr.c
189-
simple_fi_multi_mr_LDADD = libfabtests.la
187+
functional_fi_multi_mr_SOURCES = \
188+
functional/multi_mr.c
189+
functional_fi_multi_mr_LDADD = libfabtests.la
190190

191-
simple_fi_unexpected_msg_SOURCES = \
192-
simple/unexpected_msg.c
193-
simple_fi_unexpected_msg_LDADD = libfabtests.la
191+
functional_fi_unexpected_msg_SOURCES = \
192+
functional/unexpected_msg.c
193+
functional_fi_unexpected_msg_LDADD = libfabtests.la
194194

195-
simple_fi_rdm_multi_domain_SOURCES = \
196-
simple/rdm_multi_domain.c
197-
simple_fi_rdm_multi_domain_LDADD = libfabtests.la
195+
functional_fi_rdm_multi_domain_SOURCES = \
196+
functional/rdm_multi_domain.c
197+
functional_fi_rdm_multi_domain_LDADD = libfabtests.la
198198

199-
simple_fi_recv_cancel_SOURCES = \
200-
simple/recv_cancel.c
201-
simple_fi_recv_cancel_LDADD = libfabtests.la
199+
functional_fi_recv_cancel_SOURCES = \
200+
functional/recv_cancel.c
201+
functional_fi_recv_cancel_LDADD = libfabtests.la
202202

203-
simple_fi_inj_complete_SOURCES = \
204-
simple/inj_complete.c
205-
simple_fi_inj_complete_LDADD = libfabtests.la
203+
functional_fi_inj_complete_SOURCES = \
204+
functional/inj_complete.c
205+
functional_fi_inj_complete_LDADD = libfabtests.la
206206

207-
simple_fi_resource_freeing_SOURCES = \
208-
simple/resource_freeing.c
209-
simple_fi_resource_freeing_LDADD = libfabtests.la
207+
functional_fi_resource_freeing_SOURCES = \
208+
functional/resource_freeing.c
209+
functional_fi_resource_freeing_LDADD = libfabtests.la
210210

211211
streaming_fi_resmgmt_test_SOURCES = \
212212
streaming/resmgmt_test.c

‎Makefile.win

+17-17
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ libs = ..\libfabric\$(arch)\$(config)\libfabric.lib Ws2_32.lib
3737

3838
CFLAGS = $(CFLAGS) $(includes) $(defines)
3939

40-
#all: complex simple
40+
#all: complex functional
4141

42-
all: benchmarks simple unit
42+
all: benchmarks functional unit
4343

4444
{benchmarks}.c{$(outdir)}.exe:
4545
if not exist $(@D) mkdir $(@D)
4646
$(CC) /Fe$@ $** $(baseincludes) $(CFLAGS) $(libs)
4747

48-
{simple}.c{$(outdir)}.exe:
48+
{functional}.c{$(outdir)}.exe:
4949
if not exist $(@D) mkdir $(@D)
5050
$(CC) /Fe$@ $** $(baseincludes) $(CFLAGS) $(libs)
5151

@@ -57,7 +57,7 @@ all: benchmarks simple unit
5757
benchmarks: $(outdir)\msg_pingpong.exe $(outdir)\rdm_cntr_pingpong.exe \
5858
$(outdir)\rdm_pingpong.exe $(outdir)\rdm_tagged_pingpong.exe
5959

60-
simple: $(outdir)\cq_data.exe $(outdir)\dgram.exe $(outdir)\dgram_waitset.exe $(outdir)\msg.exe \
60+
functional: $(outdir)\cq_data.exe $(outdir)\dgram.exe $(outdir)\dgram_waitset.exe $(outdir)\msg.exe \
6161
$(outdir)\msg_epoll.exe $(outdir)\msg_sockets.exe \
6262
$(outdir)\poll.exe $(outdir)\rdm.exe $(outdir)\rdm_rma_simple.exe $(outdir)\rdm_rma_trigger.exe \
6363
$(outdir)\rdm_tagged_peek.exe $(outdir)\scalable_ep.exe $(outdir)\inj_complete.exe
@@ -79,31 +79,31 @@ $(outdir)\rdm_pingpong.exe: {benchmarks}rdm_pingpong.c $(basedeps) {benchmarks}b
7979
$(outdir)\rdm_tagged_pingpong.exe: {benchmarks}rdm_tagged_pingpong.c $(basedeps) {benchmarks}benchmark_shared.c
8080

8181

82-
$(outdir)\cq_data.exe: {simple}cq_data.c $(basedeps)
82+
$(outdir)\cq_data.exe: {functional}cq_data.c $(basedeps)
8383

84-
$(outdir)\dgram.exe: {simple}dgram.c $(basedeps)
84+
$(outdir)\dgram.exe: {functional}dgram.c $(basedeps)
8585

86-
$(outdir)\dgram_waitset.exe: {simple}dgram_waitset.c $(basedeps)
86+
$(outdir)\dgram_waitset.exe: {functional}dgram_waitset.c $(basedeps)
8787

88-
$(outdir)\msg.exe: {simple}msg.c $(basedeps)
88+
$(outdir)\msg.exe: {functional}msg.c $(basedeps)
8989

90-
$(outdir)\msg_epoll.exe: {simple}msg_epoll.c $(basedeps)
90+
$(outdir)\msg_epoll.exe: {functional}msg_epoll.c $(basedeps)
9191

92-
$(outdir)\msg_sockets.exe: {simple}msg_sockets.c $(basedeps)
92+
$(outdir)\msg_sockets.exe: {functional}msg_sockets.c $(basedeps)
9393

94-
$(outdir)\poll.exe: {simple}poll.c $(basedeps)
94+
$(outdir)\poll.exe: {functional}poll.c $(basedeps)
9595

96-
$(outdir)\rdm.exe: {simple}rdm.c $(basedeps)
96+
$(outdir)\rdm.exe: {functional}rdm.c $(basedeps)
9797

98-
$(outdir)\rdm_rma_simple.exe: {simple}rdm_rma_simple.c $(basedeps)
98+
$(outdir)\rdm_rma_simple.exe: {functional}rdm_rma_simple.c $(basedeps)
9999

100-
$(outdir)\rdm_rma_trigger.exe: {simple}rdm_rma_trigger.c $(basedeps)
100+
$(outdir)\rdm_rma_trigger.exe: {functional}rdm_rma_trigger.c $(basedeps)
101101

102-
$(outdir)\rdm_tagged_peek.exe: {simple}rdm_tagged_peek.c $(basedeps)
102+
$(outdir)\rdm_tagged_peek.exe: {functional}rdm_tagged_peek.c $(basedeps)
103103

104-
$(outdir)\scalable_ep.exe: {simple}scalable_ep.c $(basedeps)
104+
$(outdir)\scalable_ep.exe: {functional}scalable_ep.c $(basedeps)
105105

106-
$(outdir)\inj_complete.exe: {simple}inj_complete.c $(basedeps)
106+
$(outdir)\inj_complete.exe: {functional}inj_complete.c $(basedeps)
107107

108108
$(outdir)\av_test.exe: {unit}av_test.c $(basedeps) {unit}common.c
109109

‎fabtests.vcxproj

+16-16
Original file line numberDiff line numberDiff line change
@@ -119,22 +119,22 @@
119119
<ClCompile Include="ubertest\uber.c" />
120120
<ClCompile Include="ubertest\xfer.c" />
121121
<ClCompile Include="ubertest\test_ctrl.c" />
122-
<ClCompile Include="simple\cq_data.c" />
123-
<ClCompile Include="simple\dgram.c" />
124-
<ClCompile Include="simple\dgram_waitset.c" />
125-
<ClCompile Include="simple\msg.c" />
126-
<ClCompile Include="simple\msg_epoll.c" />
127-
<ClCompile Include="simple\msg_netdir.c" />
128-
<ClCompile Include="simple\msg_sockets.c" />
129-
<ClCompile Include="simple\poll.c" />
130-
<ClCompile Include="simple\rdm.c" />
131-
<ClCompile Include="simple\rdm_rma_simple.c" />
132-
<ClCompile Include="simple\rdm_rma_trigger.c" />
133-
<ClCompile Include="simple\rdm_shared_ctx.c" />
134-
<ClCompile Include="simple\rdm_tagged_peek.c" />
135-
<ClCompile Include="simple\rdm_netdir.c" />
136-
<ClCompile Include="simple\scalable_ep.c" />
137-
<ClCompile Include="simple\inj_complete.c" />
122+
<ClCompile Include="functional\cq_data.c" />
123+
<ClCompile Include="functional\dgram.c" />
124+
<ClCompile Include="functional\dgram_waitset.c" />
125+
<ClCompile Include="functional\msg.c" />
126+
<ClCompile Include="functional\msg_epoll.c" />
127+
<ClCompile Include="functional\msg_netdir.c" />
128+
<ClCompile Include="functional\msg_sockets.c" />
129+
<ClCompile Include="functional\poll.c" />
130+
<ClCompile Include="functional\rdm.c" />
131+
<ClCompile Include="functional\rdm_rma_simple.c" />
132+
<ClCompile Include="functional\rdm_rma_trigger.c" />
133+
<ClCompile Include="functional\rdm_shared_ctx.c" />
134+
<ClCompile Include="functional\rdm_tagged_peek.c" />
135+
<ClCompile Include="functional\rdm_netdir.c" />
136+
<ClCompile Include="functional\scalable_ep.c" />
137+
<ClCompile Include="functional\inj_complete.c" />
138138
<ClCompile Include="unit\av_test.c" />
139139
<ClCompile Include="unit\cntr_test.c" />
140140
<ClCompile Include="unit\common.c" />

0 commit comments

Comments
 (0)