*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
-#define DEBUG GNUNET_EXTRA_LOGGING
/* Test Configuration Diffs Options */
enum
ADD_NEW_ENTRY,
REMOVE_SECTION,
REMOVE_ENTRY,
- COMPARE
-#if DEBUG
- , PRINT
-#endif
+ COMPARE,
+ PRINT
};
static struct GNUNET_CONFIGURATION_Handle *cfg;
-static struct GNUNET_CONFIGURATION_Handle *cfgDefault;
+static struct GNUNET_CONFIGURATION_Handle *cfg_default;
struct DiffsCBData
{
GNUNET_free_non_null (diffValue);
break;
}
-#if DEBUG
+#if 0
case PRINT:
if (NULL == cbData->section)
{
* Checking configuration diffs
*/
static int
-checkDiffs (struct GNUNET_CONFIGURATION_Handle *cfgDefault, int option)
+checkDiffs (struct GNUNET_CONFIGURATION_Handle *cfg_default, int option)
{
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_CONFIGURATION_Handle *cfgDiffs;
GNUNET_CONFIGURATION_destroy (cfgDiffs);
return 1;
}
- GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg, diffsFileName);
+ GNUNET_CONFIGURATION_write_diffs (cfg_default, cfg, diffsFileName);
GNUNET_CONFIGURATION_destroy (cfg);
/* Compare the dumped configuration with modifications done */
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, diffsFileName));
- remove (diffsFileName);
+ if (0 != remove (diffsFileName))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove", diffsFileName);
cbData.callBackOption = COMPARE;
cbData.cfgDiffs = cfgDiffs;
GNUNET_CONFIGURATION_iterate (cfg, diffsCallBack, &cbData);
if (1 == (ret = cbData.status))
{
- fprintf (stderr,
+ FPRINTF (stderr, "%s",
"Incorrect Configuration Diffs: Diffs may contain data not actually edited\n");
goto housekeeping;
}
cbData.cfgDiffs = cfg;
GNUNET_CONFIGURATION_iterate (cfgDiffs, diffsCallBack, &cbData);
if ((ret = cbData.status) == 1)
- fprintf (stderr,
+ FPRINTF (stderr, "%s",
"Incorrect Configuration Diffs: Data may be missing in diffs\n");
housekeeping:
-#if DEBUG
+#if 0
cbData.section = NULL;
cbData.callBackOption = PRINT;
printf ("\nExpected Diffs:\n");
return 1;
if (0 != strcmp ("b", c))
{
- fprintf (stderr, "Got `%s'\n", c);
+ FPRINTF (stderr, "Got `%s'\n", c);
GNUNET_free (c);
return 2;
}
}
GNUNET_free (c);
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_size (cfg, "last", "size", &l))
+ {
+ GNUNET_break (0);
+ return 10;
+ }
+ if (l != 512 * 1024)
+ {
+ GNUNET_break (0);
+ return 11;
+ }
return 0;
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_parse (cfg, "test_configuration_data.conf"))
{
- fprintf (stderr, "Failed to parse configuration file\n");
+ FPRINTF (stderr, "%s", "Failed to parse configuration file\n");
GNUNET_CONFIGURATION_destroy (cfg);
return 1;
}
if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, "/tmp/gnunet-test.conf"))
{
- fprintf (stderr, "Failed to write configuration file\n");
+ FPRINTF (stderr, "%s", "Failed to write configuration file\n");
GNUNET_CONFIGURATION_destroy (cfg);
return 1;
}
GNUNET_CONFIGURATION_destroy (cfg);
/* Testing configuration diffs */
- cfgDefault = GNUNET_CONFIGURATION_create ();
- if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfgDefault, NULL))
+ cfg_default = GNUNET_CONFIGURATION_create ();
+ if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg_default, NULL))
{
GNUNET_break (0);
- GNUNET_CONFIGURATION_destroy (cfgDefault);
+ GNUNET_CONFIGURATION_destroy (cfg_default);
return 1;
}
/* Nothing changed in the new configuration */
- failureCount += checkDiffs (cfgDefault, EDIT_NOTHING);
+ failureCount += checkDiffs (cfg_default, EDIT_NOTHING);
/* Modify all entries of the last section */
- failureCount += checkDiffs (cfgDefault, EDIT_SECTION);
+ failureCount += checkDiffs (cfg_default, EDIT_SECTION);
/* Add a new section */
- failureCount += checkDiffs (cfgDefault, ADD_NEW_SECTION);
+ failureCount += checkDiffs (cfg_default, ADD_NEW_SECTION);
/* Add a new entry to the last section */
- failureCount += checkDiffs (cfgDefault, ADD_NEW_ENTRY);
+ failureCount += checkDiffs (cfg_default, ADD_NEW_ENTRY);
/* Modify all entries in the configuration */
- failureCount += checkDiffs (cfgDefault, EDIT_ALL);
+ failureCount += checkDiffs (cfg_default, EDIT_ALL);
- GNUNET_CONFIGURATION_destroy (cfgDefault);
+ GNUNET_CONFIGURATION_destroy (cfg_default);
error:
if (failureCount != 0)
{
- fprintf (stderr, "Test failed: %u\n", failureCount);
+ FPRINTF (stderr, "Test failed: %u\n", failureCount);
return 1;
}
return 0;