X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_disk.c;h=502546d4545967cc3edf09f7bf8c91565e1a9ae3;hb=cf5a23aa7d5d939038b78ff6ce47ceb5665281bb;hp=d8d8021e5ed2bcdf1eda020f9749d4641f0a3b8d;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git diff --git a/src/util/test_disk.c b/src/util/test_disk.c index d8d8021e5..502546d45 100644 --- a/src/util/test_disk.c +++ b/src/util/test_disk.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2001, 2002, 2003, 2005, 2006, 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 2001, 2002, 2003, 2005, 2006, 2009 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -24,9 +24,7 @@ * @author Christian Grothoff */ #include "platform.h" -#include "gnunet_common.h" -#include "gnunet_disk_lib.h" -#include "gnunet_scheduler_lib.h" +#include "gnunet_util_lib.h" #define TESTSTRING "Hello World\0" @@ -37,8 +35,7 @@ testReadWrite () int ret; if (strlen (TESTSTRING) != - GNUNET_DISK_fn_write (".testfile", TESTSTRING, - strlen (TESTSTRING), + GNUNET_DISK_fn_write (".testfile", TESTSTRING, strlen (TESTSTRING), GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE)) return 1; @@ -47,15 +44,14 @@ testReadWrite () ret = GNUNET_DISK_fn_read (".testfile", tmp, sizeof (tmp) - 1); if (ret < 0) { - fprintf (stderr, "Error reading file `%s' in testReadWrite\n", ".testfile"); + FPRINTF (stderr, "Error reading file `%s' in testReadWrite\n", ".testfile"); return 1; } tmp[ret] = '\0'; if (0 != memcmp (tmp, TESTSTRING, strlen (TESTSTRING) + 1)) { - fprintf (stderr, - "Error in testReadWrite: *%s* != *%s* for file %s\n", - tmp, TESTSTRING, ".testfile"); + FPRINTF (stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp, + TESTSTRING, ".testfile"); return 1; } GNUNET_DISK_file_copy (".testfile", ".testfile2"); @@ -63,16 +59,15 @@ testReadWrite () ret = GNUNET_DISK_fn_read (".testfile2", tmp, sizeof (tmp) - 1); if (ret < 0) { - fprintf (stderr, - "Error reading file `%s' in testReadWrite\n", ".testfile2"); + FPRINTF (stderr, "Error reading file `%s' in testReadWrite\n", + ".testfile2"); return 1; } tmp[ret] = '\0'; if (0 != memcmp (tmp, TESTSTRING, strlen (TESTSTRING) + 1)) { - fprintf (stderr, - "Error in testReadWrite: *%s* != *%s* for file %s\n", - tmp, TESTSTRING, ".testfile2"); + FPRINTF (stderr, "Error in testReadWrite: *%s* != *%s* for file %s\n", tmp, + TESTSTRING, ".testfile2"); return 1; } @@ -89,41 +84,21 @@ testOpenClose () { struct GNUNET_DISK_FileHandle *fh; uint64_t size; - long avail; - fh = GNUNET_DISK_file_open (".testfile", GNUNET_DISK_OPEN_READWRITE - | GNUNET_DISK_OPEN_CREATE, + fh = GNUNET_DISK_file_open (".testfile", + GNUNET_DISK_OPEN_READWRITE | + GNUNET_DISK_OPEN_CREATE, GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE); GNUNET_assert (GNUNET_NO == GNUNET_DISK_handle_invalid (fh)); GNUNET_break (5 == GNUNET_DISK_file_write (fh, "Hello", 5)); GNUNET_DISK_file_close (fh); GNUNET_break (GNUNET_OK == - GNUNET_DISK_file_size (".testfile", &size, GNUNET_NO)); + GNUNET_DISK_file_size (".testfile", &size, GNUNET_NO, GNUNET_YES)); if (size != 5) return 1; GNUNET_break (0 == UNLINK (".testfile")); - /* test that avail goes down as we fill the disk... */ - GNUNET_log_skip (1, GNUNET_NO); - avail = GNUNET_DISK_get_blocks_available (".testfile"); - GNUNET_log_skip (0, GNUNET_NO); - fh = GNUNET_DISK_file_open (".testfile", GNUNET_DISK_OPEN_READWRITE - | GNUNET_DISK_OPEN_CREATE, - GNUNET_DISK_PERM_USER_WRITE | - GNUNET_DISK_PERM_USER_READ); - GNUNET_assert (GNUNET_NO == GNUNET_DISK_handle_invalid (fh)); - while ((avail == GNUNET_DISK_get_blocks_available (".testfile")) && - (avail != -1)) - if (16 != GNUNET_DISK_file_write (fh, "HelloWorld123456", 16)) - { - GNUNET_DISK_file_close (fh); - GNUNET_break (0 == UNLINK (".testfile")); - return 1; - } - GNUNET_DISK_file_close (fh); - GNUNET_break (0 == UNLINK (".testfile")); - return 0; } @@ -156,8 +131,7 @@ testDirScan () } static void -iter_callback (void *cls, - struct GNUNET_DISK_DirectoryIterator *di, +iter_callback (void *cls, struct GNUNET_DISK_DirectoryIterator *di, const char *filename, const char *dirname) { int *i = cls; @@ -194,27 +168,6 @@ testDirIter () } -static int -testGetHome () -{ - struct GNUNET_CONFIGURATION_Handle *cfg; - char *fn; - int ret; - - cfg = GNUNET_CONFIGURATION_create (); - GNUNET_assert (cfg != NULL); - GNUNET_CONFIGURATION_set_value_string (cfg, "service", "HOME", - "/tmp/test-gnunet-disk-a/b/c"); - fn = GNUNET_DISK_get_home_filename (cfg, "service", "d", "e", NULL); - GNUNET_assert (fn != NULL); - GNUNET_CONFIGURATION_destroy (cfg); - ret = strcmp ("/tmp/test-gnunet-disk-a/b/c/d/e", fn); - GNUNET_free (fn); - GNUNET_break (GNUNET_OK == - GNUNET_DISK_directory_remove ("/tmp/test-gnunet-disk-a")); - return ret; -} - static int testCanonicalize () { @@ -233,9 +186,11 @@ testCanonicalize () static int testChangeOwner () { +#ifndef WINDOWS GNUNET_log_skip (1, GNUNET_NO); if (GNUNET_OK == GNUNET_DISK_file_change_owner ("/dev/null", "unknownuser")) return 1; +#endif return 0; } @@ -252,7 +207,7 @@ testDirMani () return 1; if (GNUNET_OK != GNUNET_DISK_directory_create ("test")) return 1; - if (GNUNET_YES != GNUNET_DISK_directory_test ("test")) + if (GNUNET_YES != GNUNET_DISK_directory_test ("test", GNUNET_YES)) return 1; if (GNUNET_OK != GNUNET_DISK_directory_remove ("test")) return 1; @@ -272,13 +227,12 @@ main (int argc, char *argv[]) failureCount += testOpenClose (); failureCount += testDirScan (); failureCount += testDirIter (); - failureCount += testGetHome (); failureCount += testCanonicalize (); failureCount += testChangeOwner (); failureCount += testDirMani (); if (failureCount != 0) { - fprintf (stderr, "\n%u TESTS FAILED!\n", failureCount); + FPRINTF (stderr, "\n%u TESTS FAILED!\n", failureCount); return -1; } return 0;