Skip to content

Commit 3d81efb

Browse files
jacobwilliamsjacobwilliams
committed
try to fix CMake tests in CI
Fixes #24
1 parent 7e21102 commit 3d81efb

File tree

4 files changed

+122
-92
lines changed

4 files changed

+122
-92
lines changed

‎files/csv_test.out.ref

+82-56
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
csv_test_1
44
============================
55

6-
read file: ./test.csv
7-
8-
File: test.csv
9-
6+
read file:
7+
8+
File: test.csv
9+
1010
Header Type
1111
id 3
1212
first_name 1
1313
age 2
1414
ok 4
15-
16-
print all the rows:
15+
16+
print all the rows:
1717
1 Julie 80.244 false
1818
2 Jose 11.569 true
1919
3 Lois 12.339 true
@@ -33,59 +33,85 @@ ok 4
3333
17 Carol 54.498 false
3434
18 Alice 2.505 true
3535
19 Randy 39.775 false
36-
37-
get some vectors:
38-
39-
age:
40-
80.244
41-
11.569
42-
12.339
43-
63.173
44-
57.063
45-
79.705
46-
19.347
47-
16.909
48-
67.749
49-
43.705
50-
9.931
51-
72.657
52-
10.901
53-
9.966
54-
10.875
55-
33.268
56-
54.498
57-
2.505
58-
39.775
59-
read file: ./test_2_columns.csv
60-
61-
File: test_2_columns.csv
62-
36+
37+
get some vectors:
38+
39+
get real(wp) vector:
40+
age:
41+
80.244
42+
11.569
43+
12.339
44+
63.173
45+
57.063
46+
79.705
47+
19.347
48+
16.909
49+
67.749
50+
43.705
51+
9.931
52+
72.657
53+
10.901
54+
9.966
55+
10.875
56+
33.268
57+
54.498
58+
2.505
59+
39.775
60+
get real(sp) vector:
61+
age:
62+
80.244
63+
11.569
64+
12.339
65+
63.173
66+
57.063
67+
79.705
68+
19.347
69+
16.909
70+
67.749
71+
43.705
72+
9.931
73+
72.657
74+
10.901
75+
9.966
76+
10.875
77+
33.268
78+
54.498
79+
2.505
80+
39.775
81+
read file:
82+
83+
File: test_2_columns.csv
84+
6385
Header Type
6486
id 3
6587
first_name 1
66-
67-
print all the rows:
88+
89+
print all the rows:
6890
2 Jose
6991
3 Lois
7092
4 Walter
71-
72-
get some vectors:
73-
74-
name:
75-
Jose
76-
Lois
77-
Walter
78-
79-
============================
80-
csv_write_test
81-
============================
82-
83-
84-
============================
85-
csv_read_test
86-
============================
87-
88-
x= 1.0000000000000000 4.0000000000000000
89-
y= 2.0000000000000000 5.0000000000000000
90-
z= 3.0000000000000000 6.0000000000000000
91-
t= T F
93+
94+
get some vectors:
95+
96+
name:
97+
Jose
98+
Lois
99+
Walter
100+
101+
============================
102+
csv_write_test
103+
============================
104+
105+
106+
============================
107+
csv_read_test
108+
============================
109+
110+
x= 1.000 4.000 1.500 4.500
111+
y= 2.000 5.000 2.500 5.500
112+
z= 3.000 6.000 3.500 6.500
113+
t= T F T F
114+
x= 1.000 4.000 1.500 4.500
115+
y= 2.000 5.000 2.500 5.500
116+
z= 3.000 6.000 3.500 6.500
117+
t= T F T F

‎files/test2.csv.ref

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
"x","y","z","t"
22
0.10000000000000000E+0001,0.20000000000000000E+0001,0.30000000000000000E+0001,T
33
4.000,5.000,6.000,F
4+
0.15000000000000000E+0001,0.25000000000000000E+0001,0.35000000000000000E+0001,T
5+
4.500,5.500,6.500,F

‎files/test_write.csv.ref

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
"x","y","z","t"
22
1.000,2.000,3.000,T
33
4.000,5.000,6.000,F
4+
1.500,2.500,3.500,T
5+
4.500,5.500,6.500,F

‎src/tests/csv_test.f90

+36-36
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ subroutine csv_test_1()
5656
file = trim(dirs_to_try(k))//trim(files_to_test(ifile))
5757
if (file_exists(file)) exit ! found it
5858
end do
59-
write(*,*) 'read file: '//trim(file)
59+
write(*,*) 'read file: '
6060

6161
! read the file:
6262
if (ifile==1) then
@@ -70,45 +70,45 @@ subroutine csv_test_1()
7070
error stop 'could not open file'
7171
end if
7272

73-
write(*,*) ''
74-
write(*,*) 'File: '//trim(files_to_test(ifile))
73+
write(*,'(A)') ''
74+
write(*,'(A)') 'File: '//trim(files_to_test(ifile))
7575
! print the header and type info:
7676
call f%get_header(header,status_ok)
7777
call f%variable_types(itypes,status_ok)
78-
write(*,*) ''
78+
write(*,'(A)') ''
7979
write(*,'(*(A30,1X,A4))') 'Header', 'Type'
8080
do i=1,size(header)
8181
write(*,'(*(A30,1X,I4))') header(i), itypes(i)
8282
end do
8383

84-
write(*,*) ''
85-
write(*,*) 'print all the rows:'
84+
write(*,'(A)') ''
85+
write(*,'(A)') 'print all the rows:'
8686

8787
call f%get(csv_data,status_ok)
8888
do i=1,size(csv_data,1)
8989
write(*,'(*(A30,1X))') csv_data(i,:)
9090
end do
9191

92-
write(*,*) ''
93-
write(*,*) 'get some vectors:'
92+
write(*,'(A)') ''
93+
write(*,'(A)') 'get some vectors:'
9494
if (ifile==1) then
95-
write(*,*) ''
96-
write(*,*) 'get real(wp) vector:'
97-
write(*,*) 'age:'
95+
write(*,'(A)') ''
96+
write(*,'(A)') 'get real(wp) vector:'
97+
write(*,'(A)') 'age:'
9898
call f%get(3,x,status_ok)
9999
write(*,'(F6.3,1x)',advance='NO') x
100-
write(*,*) ''
101-
write(*,*) 'get real(sp) vector:'
102-
write(*,*) 'age:'
100+
write(*,'(A)') ''
101+
write(*,'(A)') 'get real(sp) vector:'
102+
write(*,'(A)') 'age:'
103103
call f%get(3,y,status_ok)
104104
write(*,'(F6.3,1x)',advance='NO') y
105-
write(*,*) ''
105+
write(*,'(A)') ''
106106
else
107-
write(*,*) ''
108-
write(*,*) 'name:'
107+
write(*,'(A)') ''
108+
write(*,'(A)') 'name:'
109109
call f%get(2,names,status_ok)
110110
write(*,'(A10,1x)',advance='NO') names
111-
write(*,*) ''
111+
write(*,'(A)') ''
112112
end if
113113

114114
end do
@@ -146,11 +146,11 @@ subroutine csv_write_test()
146146
type(csv_file) :: f
147147
logical :: status_ok
148148

149-
write(*,*) ''
150-
write(*,*) '============================'
151-
write(*,*) ' csv_write_test '
152-
write(*,*) '============================'
153-
write(*,*) ''
149+
write(*,'(A)') ''
150+
write(*,'(A)') '============================'
151+
write(*,'(A)') ' csv_write_test '
152+
write(*,'(A)') '============================'
153+
write(*,'(A)') ''
154154

155155
! open the file
156156
call f%open('test_write.csv',n_cols=4,status_ok=status_ok)
@@ -195,11 +195,11 @@ subroutine csv_read_test()
195195
logical :: status_ok
196196
integer,dimension(:),allocatable :: itypes
197197

198-
write(*,*) ''
199-
write(*,*) '============================'
200-
write(*,*) ' csv_read_test '
201-
write(*,*) '============================'
202-
write(*,*) ''
198+
write(*,'(A)') ''
199+
write(*,'(A)') '============================'
200+
write(*,'(A)') ' csv_read_test '
201+
write(*,'(A)') '============================'
202+
write(*,'(A)') ''
203203

204204
! read the file
205205
call f%read('test_write.csv',header_row=1,status_ok=status_ok)
@@ -216,20 +216,20 @@ subroutine csv_read_test()
216216
call f%get(3,z,status_ok)
217217
call f%get(4,t,status_ok)
218218

219-
write(*,*) 'x=',x
220-
write(*,*) 'y=',y
221-
write(*,*) 'z=',z
222-
write(*,*) 't=',t
219+
write(*,'(A,1X,*(F12.3,1X))') 'x=',x
220+
write(*,'(A,1X,*(F12.3,1X))') 'y=',y
221+
write(*,'(A,1X,*(F12.3,1X))') 'z=',z
222+
write(*,'(A,1X,*(L1,1X))') 't=',t
223223

224224
call f%get(1,u,status_ok)
225225
call f%get(2,v,status_ok)
226226
call f%get(3,w,status_ok)
227227
call f%get(4,t,status_ok)
228228

229-
write(*,*) 'x=',u
230-
write(*,*) 'y=',v
231-
write(*,*) 'z=',w
232-
write(*,*) 't=',t
229+
write(*,'(A,1X,*(F12.3,1X))') 'x=',u
230+
write(*,'(A,1X,*(F12.3,1X))') 'y=',v
231+
write(*,'(A,1X,*(F12.3,1X))') 'z=',w
232+
write(*,'(A,1X,*(L1,1X))') 't=',t
233233

234234
! destroy the file
235235
call f%destroy()

0 commit comments

Comments
 (0)