From 262c51075b180b94e8689e71cf66ee115c03e9a9 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Thu, 18 Dec 2008 09:58:42 +0100 Subject: [PATCH] Tests: remove manual init of config-system --- tests/backend/test-filedescriptors.c | 5 ----- tests/backend/test-filehandles.c | 2 -- tests/backend/test-filemmap.c | 7 ------- tests/lumiera/test-config.c | 31 +--------------------------- tests/lumiera/test-interfaces.c | 4 ---- 5 files changed, 1 insertion(+), 48 deletions(-) diff --git a/tests/backend/test-filedescriptors.c b/tests/backend/test-filedescriptors.c index 7f92a7fd1..ad3f1fd6a 100644 --- a/tests/backend/test-filedescriptors.c +++ b/tests/backend/test-filedescriptors.c @@ -30,7 +30,6 @@ TESTS_BEGIN TEST ("acquire_existing") { - lumiera_config_init ("./"); lumiera_backend_init (); llist node; llist_init (&node); @@ -49,7 +48,6 @@ TEST ("acquire_existing") TEST ("acquire_existing_again") { - lumiera_config_init ("./"); lumiera_backend_init (); llist node; llist_init (&node); @@ -71,7 +69,6 @@ TEST ("acquire_existing_again") TEST ("acquire_existing_3files") { - lumiera_config_init ("./"); lumiera_backend_init (); llist node1; llist_init (&node1); @@ -105,7 +102,6 @@ TEST ("acquire_existing_3files") TEST ("acquire_create") { - lumiera_config_init ("./"); lumiera_backend_init (); llist node; llist_init (&node); @@ -123,7 +119,6 @@ TEST ("acquire_create") TEST ("acquire_create_dir") { - lumiera_config_init ("./"); lumiera_backend_init (); llist node; llist_init (&node); diff --git a/tests/backend/test-filehandles.c b/tests/backend/test-filehandles.c index 8e2f67edd..6efca78b5 100644 --- a/tests/backend/test-filehandles.c +++ b/tests/backend/test-filehandles.c @@ -31,7 +31,6 @@ TESTS_BEGIN TEST ("basic") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp_testfile", LUMIERA_FILE_CREATE); @@ -53,7 +52,6 @@ TEST ("basic") TEST ("more") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile files[100]; diff --git a/tests/backend/test-filemmap.c b/tests/backend/test-filemmap.c index b07c430e4..17861cb85 100644 --- a/tests/backend/test-filemmap.c +++ b/tests/backend/test-filemmap.c @@ -105,7 +105,6 @@ TEST ("fd_semantic") TEST ("mmap_missing_chunksize") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp-filemmap", LUMIERA_FILE_CREATE); @@ -123,7 +122,6 @@ TEST ("mmap_missing_chunksize") TEST ("mmap_forget_releasing") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp-filemmap", LUMIERA_FILE_CREATE); lumiera_file_chunksize_set (file, 4096); @@ -146,7 +144,6 @@ TEST ("mmap_forget_releasing") TEST ("mmap_simple") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp-filemmap", LUMIERA_FILE_CREATE); lumiera_file_chunksize_set (file, 4096); @@ -174,7 +171,6 @@ TEST ("mmap_simple") TEST ("mmap_checkout_twice") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp-filemmap", LUMIERA_FILE_CREATE); lumiera_file_chunksize_set (file, 4096); @@ -210,7 +206,6 @@ TEST ("mmap_checkout_twice") TEST ("mmap_checkout_again") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp-filemmap", LUMIERA_FILE_CREATE); lumiera_file_chunksize_set (file, 4096); @@ -242,7 +237,6 @@ TEST ("mmap_checkout_again") TEST ("mmap_grow_existing_file") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp-filemmap", LUMIERA_FILE_READWRITE); @@ -270,7 +264,6 @@ TEST ("mmap_grow_existing_file") TEST ("mmap_readonly_file") { - lumiera_config_init ("./"); lumiera_backend_init (); LumieraFile file = lumiera_file_new (",tmp-filemmap", LUMIERA_FILE_READONLY); diff --git a/tests/lumiera/test-config.c b/tests/lumiera/test-config.c index 3c6bf0de2..b29336a18 100644 --- a/tests/lumiera/test-config.c +++ b/tests/lumiera/test-config.c @@ -30,7 +30,7 @@ TESTS_BEGIN TEST ("init") { - lumiera_config_init ("./"); +/* lumiera_config_init ("./"); */ printf ("initialized\n"); lumiera_config_destroy (); printf ("destroyed\n"); @@ -40,7 +40,6 @@ TEST ("init") TEST ("configitem_simple") { REQUIRE (argv[2]); - lumiera_config_init ("./"); LumieraConfigitem item; @@ -64,7 +63,6 @@ TEST ("configitem_simple") TEST ("lookup") { - lumiera_config_init ("./"); lumiera_config_lookup lookup; lumiera_config_lookup_init (&lookup); @@ -89,7 +87,6 @@ TEST ("change_value") REQUIRE (argv[3]); REQUIRE (argv[4]); - lumiera_config_init ("./"); const char* value; if (!lumiera_config_set (argv[2], argv[3])) @@ -118,8 +115,6 @@ TEST ("basic_set_get") REQUIRE (argv[2]); REQUIRE (argv[3]); - lumiera_config_init ("./"); - if (!lumiera_config_set (argv[2], argv[3])) printf ("failure setting first time '%s%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -143,8 +138,6 @@ TEST ("number_get") REQUIRE (argv[2]); REQUIRE (argv[3]); - lumiera_config_init ("./"); - long long number = 0; lumiera_config_setdefault (lumiera_tmpbuf_snprintf (SIZE_MAX, "%s = %s", argv[2], argv[3])); @@ -162,8 +155,6 @@ TEST ("number_get_nodefault") { REQUIRE (argv[2]); - lumiera_config_init ("./"); - long long number = 0; if (lumiera_config_number_get (argv[2], &number)) @@ -180,8 +171,6 @@ TEST ("number_set") REQUIRE (argv[2]); REQUIRE (argv[3]); - lumiera_config_init ("./"); - signed long long number = atoll (argv[3]); if (!lumiera_config_number_set (argv[2], &number)) @@ -201,8 +190,6 @@ TEST ("string_get") REQUIRE (argv[2]); REQUIRE (argv[3]); - lumiera_config_init ("./"); - const char* string; lumiera_config_setdefault (lumiera_tmpbuf_snprintf (SIZE_MAX, "%s = %s", argv[2], argv[3])); @@ -221,8 +208,6 @@ TEST ("string_set") REQUIRE (argv[2]); REQUIRE (argv[3]); - lumiera_config_init ("./"); - if (!lumiera_config_string_set (argv[2], &argv[3])) printf ("failed setting string '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -241,8 +226,6 @@ TEST ("word_get") REQUIRE (argv[2]); REQUIRE (argv[3]); - lumiera_config_init ("./"); - const char* word; lumiera_config_setdefault (lumiera_tmpbuf_snprintf (SIZE_MAX, "%s = %s", argv[2], argv[3])); @@ -261,8 +244,6 @@ TEST ("word_set") REQUIRE (argv[2]); REQUIRE (argv[3]); - lumiera_config_init ("./"); - if (!lumiera_config_word_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -279,7 +260,6 @@ TEST ("word_set") TEST ("configitem_simple_ctor_dtor") { REQUIRE (argv[2]); - lumiera_config_init ("./"); LumieraConfigitem item; @@ -292,7 +272,6 @@ TEST ("configitem_simple_ctor_dtor") TEST ("configitem_simple_content_check") { REQUIRE (argv[2]); - lumiera_config_init ("./"); LumieraConfigitem item; @@ -325,8 +304,6 @@ TEST ("wordlist_get_nth") REQUIRE (argv[3]); REQUIRE (argv[4]); - lumiera_config_init ("./"); - if (!lumiera_config_wordlist_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -344,8 +321,6 @@ TEST ("wordlist_find") REQUIRE (argv[3]); REQUIRE (argv[4]); - lumiera_config_init ("./"); - if (!lumiera_config_wordlist_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -365,8 +340,6 @@ TEST ("wordlist_replace") REQUIRE (argv[5]); REQUIRE (argv[6]); - lumiera_config_init ("./"); - if (!lumiera_config_wordlist_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); @@ -388,8 +361,6 @@ TEST ("wordlist_add") REQUIRE (argv[4]); REQUIRE (argv[5]); - lumiera_config_init ("./"); - if (!lumiera_config_wordlist_set (argv[2], &argv[3])) printf ("failed setting word '%s=%s': %s\n", argv[2], argv[3], lumiera_error ()); diff --git a/tests/lumiera/test-interfaces.c b/tests/lumiera/test-interfaces.c index 17a3463fb..e68153991 100644 --- a/tests/lumiera/test-interfaces.c +++ b/tests/lumiera/test-interfaces.c @@ -461,7 +461,6 @@ TEST ("dependencies_all") TEST ("plugin_discover") { - lumiera_config_init ("./"); lumiera_interfaceregistry_init (); if (lumiera_plugin_discover (lumiera_plugin_load, lumiera_plugin_register)) @@ -480,7 +479,6 @@ TEST ("plugin_discover") TEST ("plugin_unload") { - lumiera_config_init ("./"); lumiera_interfaceregistry_init (); lumiera_plugin_discover (lumiera_plugin_load, lumiera_plugin_register); @@ -495,7 +493,6 @@ TEST ("plugin_unload") TEST ("plugin_examplepluginc") { - lumiera_config_init ("./"); lumiera_interfaceregistry_init (); lumiera_plugin_discover (lumiera_plugin_load, lumiera_plugin_register); @@ -522,7 +519,6 @@ TEST ("plugin_examplepluginc") TEST ("plugin_examplepluginc_nested") { - lumiera_config_init ("./"); lumiera_interfaceregistry_init (); lumiera_plugin_discover (lumiera_plugin_load, lumiera_plugin_register); lumiera_config_interface_init ();