diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | src/test/test-alloc-util.c | 55 | ||||
| -rw-r--r-- | src/test/test-util.c | 28 |
4 files changed, 63 insertions, 28 deletions
diff --git a/.gitignore b/.gitignore index 713cc769d9..224c24635c 100644 --- a/.gitignore +++ b/.gitignore @@ -126,6 +126,7 @@ /test-acd /test-acl-util /test-af-list +/test-alloc-util /test-architecture /test-arphrd-list /test-ask-password-api diff --git a/Makefile.am b/Makefile.am index 4f058d55ce..11043d41b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1428,6 +1428,7 @@ tests += \ test-util \ test-hexdecoct \ test-escape \ + test-alloc-util \ test-string-util \ test-extract-word \ test-parse-util \ @@ -1763,6 +1764,12 @@ test_hexdecoct_SOURCES = \ test_hexdecoct_LDADD = \ libbasic.la +test_alloc_util_SOURCES = \ + src/test/test-alloc-util.c + +test_alloc_util_LDADD = \ + libbasic.la + test_escape_SOURCES = \ src/test/test-escape.c diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c new file mode 100644 index 0000000000..cc4821eaf5 --- /dev/null +++ b/src/test/test-alloc-util.c @@ -0,0 +1,55 @@ +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#include "alloc-util.h" +#include "macro.h" +#include "util.h" + +static void test_alloca(void) { + static const uint8_t zero[997] = { }; + char *t; + + t = alloca_align(17, 512); + assert_se(!((uintptr_t)t & 0xff)); + memzero(t, 17); + + t = alloca0_align(997, 1024); + assert_se(!((uintptr_t)t & 0x1ff)); + assert_se(!memcmp(t, zero, 997)); +} + +static void test_memdup_multiply(void) { + int org[] = {1, 2, 3}; + int *dup; + + dup = (int*)memdup_multiply(org, sizeof(int), 3); + + assert_se(dup); + assert_se(dup[0] == 1); + assert_se(dup[1] == 2); + assert_se(dup[2] == 3); + free(dup); +} + +int main(int argc, char *argv[]) { + test_alloca(); + test_memdup_multiply(); + + return 0; +} diff --git a/src/test/test-util.c b/src/test/test-util.c index eb10f57b6e..901898c29c 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -144,19 +144,6 @@ static void test_container_of(void) { v1) == &myval); } -static void test_alloca(void) { - static const uint8_t zero[997] = { }; - char *t; - - t = alloca_align(17, 512); - assert_se(!((uintptr_t)t & 0xff)); - memzero(t, 17); - - t = alloca0_align(997, 1024); - assert_se(!((uintptr_t)t & 0x1ff)); - assert_se(!memcmp(t, zero, 997)); -} - static void test_div_round_up(void) { int div; @@ -228,19 +215,6 @@ static void test_parse_uid(void) { assert_se(r == -EINVAL); } -static void test_memdup_multiply(void) { - int org[] = {1, 2, 3}; - int *dup; - - dup = (int*)memdup_multiply(org, sizeof(int), 3); - - assert_se(dup); - assert_se(dup[0] == 1); - assert_se(dup[1] == 2); - assert_se(dup[2] == 3); - free(dup); -} - static void test_u64log2(void) { assert_se(u64log2(0) == 0); assert_se(u64log2(8) == 3); @@ -954,11 +928,9 @@ int main(int argc, char *argv[]) { test_align_power2(); test_max(); test_container_of(); - test_alloca(); test_div_round_up(); test_close_many(); test_parse_uid(); - test_memdup_multiply(); test_u64log2(); test_protect_errno(); test_parse_cpu_set(); |