Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
aml
Commits
466eb6f3
Commit
466eb6f3
authored
Jul 01, 2019
by
Swann Perarnau
Browse files
[fix] more warnings in tests
Note that this still fails on make check, some problem with CPPFLAGS/LDFLAGS
parent
e0852ee6
Changes
3
Hide whitespace changes
Inline
Side-by-side
tests/utils/test_bitmap.c
View file @
466eb6f3
...
...
@@ -11,25 +11,12 @@
#include "aml.h"
#include <assert.h>
static
const
unsigned
long
is
[
8
]
=
{
0
,
AML_BITMAP_NBITS
/
4
,
3
*
AML_BITMAP_NBITS
/
4
,
AML_BITMAP_NBITS
-
1
,
AML_BITMAP_NBITS
,
AML_BITMAP_NBITS
+
AML_BITMAP_NBITS
/
4
,
AML_BITMAP_NBITS
+
3
*
AML_BITMAP_NBITS
/
4
,
AML_BITMAP_NBITS
+
AML_BITMAP_NBITS
-
1
};
static
const
int
nis
=
sizeof
(
is
)
/
sizeof
(
*
is
);
void
test_bitmap_fill
(){
unsigned
long
i
;
struct
aml_bitmap
b
;
aml_bitmap_fill
(
&
b
);
for
(
i
=
0
;
i
<
nis
;
i
++
)
assert
(
aml_bitmap_isset
(
&
b
,
i
s
[
i
]
));
for
(
i
=
0
;
i
<
AML_BITMAP_MAX
;
i
++
)
assert
(
aml_bitmap_isset
(
&
b
,
i
));
assert
(
aml_bitmap_nset
(
&
b
)
==
AML_BITMAP_MAX
);
}
...
...
@@ -37,8 +24,8 @@ void test_bitmap_zero(){
unsigned
long
i
;
struct
aml_bitmap
b
;
aml_bitmap_zero
(
&
b
);
for
(
i
=
0
;
i
<
nis
;
i
++
)
assert
(
!
aml_bitmap_isset
(
&
b
,
i
s
[
i
]
));
for
(
i
=
0
;
i
<
AML_BITMAP_MAX
;
i
++
)
assert
(
!
aml_bitmap_isset
(
&
b
,
i
));
assert
(
aml_bitmap_nset
(
&
b
)
==
0
);
}
...
...
@@ -47,108 +34,37 @@ void test_bitmap_set(){
struct
aml_bitmap
b
;
aml_bitmap_zero
(
&
b
);
for
(
i
=
0
;
i
<
nis
;
i
++
){
aml_bitmap_set
(
&
b
,
i
s
[
i
]
);
assert
(
aml_bitmap_isset
(
&
b
,
i
s
[
i
]
));
for
(
i
=
0
;
i
<
AML_BITMAP_MAX
;
i
++
){
aml_bitmap_set
(
&
b
,
i
);
assert
(
aml_bitmap_isset
(
&
b
,
i
));
for
(
j
=
0
;
j
<
i
s
[
i
]
;
j
++
)
for
(
j
=
0
;
j
<
i
;
j
++
)
assert
(
!
aml_bitmap_isset
(
&
b
,
j
));
for
(
j
=
i
s
[
i
]
+
1
;
j
<
AML_BITMAP_MAX
;
j
++
)
for
(
j
=
i
+
1
;
j
<
AML_BITMAP_MAX
;
j
++
)
assert
(
!
aml_bitmap_isset
(
&
b
,
j
));
assert
(
aml_bitmap_nset
(
&
b
)
==
1
);
aml_bitmap_clear
(
&
b
,
is
[
i
]);
assert
(
!
aml_bitmap_isset
(
&
b
,
is
[
i
]));
}
}
void
test_bitmap_string_conversion
(
const
char
*
bitmap_str
){
struct
aml_bitmap
b
,
c
;
char
*
cstr
;
assert
(
aml_bitmap_from_string
(
&
b
,
bitmap_str
)
==
0
);
if
(
bitmap_str
==
NULL
||
!
strcasecmp
(
bitmap_str
,
"none"
)
||
!
strcasecmp
(
bitmap_str
,
"zero"
)
||
!
strcasecmp
(
bitmap_str
,
"empty"
)){
assert
(
aml_bitmap_iszero
(
&
b
));
}
else
if
(
!
strcasecmp
(
bitmap_str
,
"all"
)
||
!
strcasecmp
(
bitmap_str
,
"full"
)
||
!
strcasecmp
(
bitmap_str
,
"fill"
)){
assert
(
aml_bitmap_isfull
(
&
b
));
}
cstr
=
aml_bitmap_to_string
(
&
b
);
assert
(
cstr
!=
NULL
);
assert
(
aml_bitmap_from_string
(
&
c
,
cstr
)
==
0
);
assert
(
aml_bitmap_isequal
(
&
b
,
&
c
));
free
(
cstr
);
}
void
test_bitmap_string
(){
const
size_t
int_len
=
16
;
char
*
bstr
,
*
next
;
int
i
;
const
size_t
max_len
=
int_len
*
(
1
+
nis
);
size_t
len
=
0
;
struct
aml_bitmap
b
;
assert
(
aml_bitmap_from_string
(
&
b
,
"unapropriate string"
)
==
-
1
);
test_bitmap_string_conversion
(
"all"
);
test_bitmap_string_conversion
(
"full"
);
test_bitmap_string_conversion
(
"fill"
);
test_bitmap_string_conversion
(
"zero"
);
test_bitmap_string_conversion
(
"empty"
);
test_bitmap_string_conversion
(
"none"
);
test_bitmap_string_conversion
(
NULL
);
bstr
=
malloc
(
int_len
);
for
(
i
=
0
;
i
<
nis
;
i
++
){
memset
(
bstr
,
0
,
int_len
);
snprintf
(
bstr
,
int_len
,
"%lu"
,
is
[
i
]);
test_bitmap_string_conversion
(
bstr
);
assert
(
aml_bitmap_from_string
(
&
b
,
bstr
)
==
0
);
assert
(
aml_bitmap_isset
(
&
b
,
is
[
i
]));
}
free
(
bstr
);
bstr
=
malloc
(
max_len
);
next
=
bstr
;
memset
(
bstr
,
0
,
max_len
);
for
(
i
=
0
;
i
<
nis
;
i
++
){
len
+=
snprintf
(
bstr
+
len
,
max_len
-
len
,
"%lu"
,
is
[
i
]);
if
(
i
+
1
<
nis
){
bstr
[
len
]
=
','
;
len
++
;
}
assert
(
aml_bitmap_nset
(
&
b
)
==
1
);
aml_bitmap_clear
(
&
b
,
i
);
assert
(
!
aml_bitmap_isset
(
&
b
,
i
));
}
test_bitmap_string_conversion
(
bstr
);
assert
(
aml_bitmap_from_string
(
&
b
,
bstr
)
==
0
);
for
(
i
=
0
;
i
<
nis
;
i
++
)
assert
(
aml_bitmap_isset
(
&
b
,
is
[
i
]));
free
(
bstr
);
}
void
test_bitmap_clear
(){
unsigned
long
i
,
j
;
struct
aml_bitmap
b
;
aml_bitmap_fill
(
&
b
);
for
(
i
=
0
;
i
<
nis
;
i
++
){
aml_bitmap_clear
(
&
b
,
i
s
[
i
]
);
assert
(
!
aml_bitmap_isset
(
&
b
,
i
s
[
i
]
));
for
(
i
=
0
;
i
<
AML_BITMAP_MAX
;
i
++
){
aml_bitmap_clear
(
&
b
,
i
);
assert
(
!
aml_bitmap_isset
(
&
b
,
i
));
for
(
j
=
0
;
j
<
i
s
[
i
]
;
j
++
)
for
(
j
=
0
;
j
<
i
;
j
++
)
assert
(
aml_bitmap_isset
(
&
b
,
j
));
for
(
j
=
i
s
[
i
]
+
1
;
j
<
AML_BITMAP_MAX
;
j
++
)
for
(
j
=
i
+
1
;
j
<
AML_BITMAP_MAX
;
j
++
)
assert
(
aml_bitmap_isset
(
&
b
,
j
));
assert
(
aml_bitmap_nset
(
&
b
)
==
(
AML_BITMAP_MAX
-
1
));
aml_bitmap_set
(
&
b
,
i
s
[
i
]
);
assert
(
aml_bitmap_isset
(
&
b
,
i
s
[
i
]
));
aml_bitmap_set
(
&
b
,
i
);
assert
(
aml_bitmap_isset
(
&
b
,
i
));
}
}
...
...
@@ -156,16 +72,15 @@ void test_bitmap_set_range(){
unsigned
long
i
,
ii
,
j
;
struct
aml_bitmap
b
;
aml_bitmap_zero
(
&
b
);
for
(
i
=
0
;
i
<
nis
;
i
++
){
for
(
ii
=
i
;
ii
<
nis
;
ii
++
){
assert
(
aml_bitmap_set_range
(
&
b
,
is
[
i
],
is
[
ii
])
==
0
);
assert
(
aml_bitmap_nset
(
&
b
)
==
(
1
+
is
[
ii
]
-
is
[
i
]));
for
(
j
=
0
;
j
<
is
[
i
];
j
++
)
for
(
i
=
0
;
i
<
AML_BITMAP_MAX
;
i
++
){
for
(
ii
=
i
+
1
;
ii
<
AML_BITMAP_MAX
;
ii
++
){
assert
(
aml_bitmap_set_range
(
&
b
,
i
,
ii
)
==
0
);
assert
(
aml_bitmap_nset
(
&
b
)
==
(
1
+
ii
-
i
));
for
(
j
=
0
;
j
<
i
;
j
++
)
assert
(
!
aml_bitmap_isset
(
&
b
,
j
));
for
(
j
=
i
s
[
i
]
;
j
<=
i
s
[
ii
]
;
j
++
)
for
(
j
=
i
;
j
<=
i
i
;
j
++
)
assert
(
aml_bitmap_isset
(
&
b
,
j
));
for
(
j
=
i
s
[
ii
]
+
1
;
j
<
AML_BITMAP_MAX
;
j
++
)
for
(
j
=
i
i
+
1
;
j
<
AML_BITMAP_MAX
;
j
++
)
assert
(
!
aml_bitmap_isset
(
&
b
,
j
));
aml_bitmap_zero
(
&
b
);
}
...
...
@@ -176,16 +91,15 @@ void test_bitmap_clear_range(){
unsigned
long
i
,
ii
,
j
;
struct
aml_bitmap
b
;
aml_bitmap_fill
(
&
b
);
for
(
i
=
0
;
i
<
nis
;
i
++
){
for
(
ii
=
i
;
ii
<
nis
;
ii
++
){
assert
(
aml_bitmap_clear_range
(
&
b
,
is
[
i
],
is
[
ii
])
==
0
);
assert
(
aml_bitmap_nset
(
&
b
)
==
(
AML_BITMAP_MAX
-
is
[
ii
]
+
is
[
i
]
-
1
));
for
(
j
=
0
;
j
<
is
[
i
];
j
++
)
for
(
i
=
0
;
i
<
AML_BITMAP_MAX
;
i
++
){
for
(
ii
=
i
+
1
;
ii
<
AML_BITMAP_MAX
;
ii
++
){
assert
(
aml_bitmap_clear_range
(
&
b
,
i
,
ii
)
==
0
);
assert
(
aml_bitmap_nset
(
&
b
)
==
(
AML_BITMAP_MAX
-
ii
+
i
-
1
));
for
(
j
=
0
;
j
<
i
;
j
++
)
assert
(
aml_bitmap_isset
(
&
b
,
j
));
for
(
j
=
i
s
[
i
]
;
j
<=
i
s
[
ii
]
;
j
++
)
for
(
j
=
i
;
j
<=
i
i
;
j
++
)
assert
(
!
aml_bitmap_isset
(
&
b
,
j
));
for
(
j
=
i
s
[
ii
]
+
1
;
j
<
AML_BITMAP_MAX
;
j
++
)
for
(
j
=
i
i
+
1
;
j
<
AML_BITMAP_MAX
;
j
++
)
assert
(
aml_bitmap_isset
(
&
b
,
j
));
aml_bitmap_fill
(
&
b
);
}
...
...
@@ -199,7 +113,6 @@ int main(){
test_bitmap_clear
();
test_bitmap_set_range
();
test_bitmap_clear_range
();
test_bitmap_string
();
return
0
;
}
tests/utils/test_vector.c
View file @
466eb6f3
...
...
@@ -11,7 +11,7 @@
#include "aml.h"
#include <assert.h>
int
main
(
int
argc
,
char
*
argv
[]
)
int
main
(
void
)
{
struct
aml_vector
v
;
...
...
tests/utils/test_version.c
View file @
466eb6f3
...
...
@@ -11,7 +11,7 @@
#include "aml.h"
#include <assert.h>
int
main
(
int
argc
,
char
*
argv
[]
)
int
main
(
void
)
{
assert
(
aml_version_major
==
AML_VERSION_MAJOR
);
assert
(
aml_version_minor
==
AML_VERSION_MINOR
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment