Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 30395) +++ trunk/tests/conf/conftest.c (revision 30396) @@ -402,6 +402,7 @@ pcb_message(PCB_MSG_ERROR, "unknown command '%s'", cmd); } + conf_core_uninit_pre(); pcb_conf_hid_unreg(hid_cookie); pcb_conf_uninit(); return 0; Index: trunk/tests/conf/tests/arr_merge.ref =================================================================== --- trunk/tests/conf/tests/arr_merge.ref (revision 30395) +++ trunk/tests/conf/tests/arr_merge.ref (revision 30396) @@ -2,30 +2,30 @@ I appearance/color/layer[] = === import 3 levels === Result: 0 - I appearance/color/layer[0] = #000001 <> conf_rev=1 - I appearance/color/layer[1] = #000002 <> conf_rev=1 + I appearance/color/layer[0] = #000001 <> conf_rev=4 + I appearance/color/layer[1] = #000002 <> conf_rev=4 Result: 0 - I appearance/color/layer[0] = #000101 <> conf_rev=2 - I appearance/color/layer[1] = #000102 <> conf_rev=2 + I appearance/color/layer[0] = #000101 <> conf_rev=8 + I appearance/color/layer[1] = #000102 <> conf_rev=8 Result: 0 - I appearance/color/layer[0] = #000201 <> conf_rev=3 - I appearance/color/layer[1] = #000201 <> conf_rev=3 + I appearance/color/layer[0] = #000201 <> conf_rev=12 + I appearance/color/layer[1] = #000201 <> conf_rev=12 === change policy: design->prepend (2, 1) === - I appearance/color/layer[0] = #000201 <> conf_rev=4 - I appearance/color/layer[1] = #000201 <> conf_rev=4 - I appearance/color/layer[2] = #000101 <> conf_rev=4 - I appearance/color/layer[3] = #000102 <> conf_rev=4 + I appearance/color/layer[0] = #000201 <> conf_rev=16 + I appearance/color/layer[1] = #000201 <> conf_rev=16 + I appearance/color/layer[2] = #000101 <> conf_rev=16 + I appearance/color/layer[3] = #000102 <> conf_rev=16 === change policy: user->append (2, 0, 1) === - I appearance/color/layer[0] = #000201 <> conf_rev=5 - I appearance/color/layer[1] = #000201 <> conf_rev=5 - I appearance/color/layer[2] = #000001 <> conf_rev=5 - I appearance/color/layer[3] = #000002 <> conf_rev=5 - I appearance/color/layer[4] = #000101 <> conf_rev=5 - I appearance/color/layer[5] = #000102 <> conf_rev=5 + I appearance/color/layer[0] = #000201 <> conf_rev=20 + I appearance/color/layer[1] = #000201 <> conf_rev=20 + I appearance/color/layer[2] = #000001 <> conf_rev=20 + I appearance/color/layer[3] = #000002 <> conf_rev=20 + I appearance/color/layer[4] = #000101 <> conf_rev=20 + I appearance/color/layer[5] = #000102 <> conf_rev=20 === change policy: design->append (0, 1, 2) === - I appearance/color/layer[0] = #000001 <> conf_rev=6 - I appearance/color/layer[1] = #000002 <> conf_rev=6 - I appearance/color/layer[2] = #000101 <> conf_rev=6 - I appearance/color/layer[3] = #000102 <> conf_rev=6 - I appearance/color/layer[4] = #000201 <> conf_rev=6 - I appearance/color/layer[5] = #000201 <> conf_rev=6 + I appearance/color/layer[0] = #000001 <> conf_rev=24 + I appearance/color/layer[1] = #000002 <> conf_rev=24 + I appearance/color/layer[2] = #000101 <> conf_rev=24 + I appearance/color/layer[3] = #000102 <> conf_rev=24 + I appearance/color/layer[4] = #000201 <> conf_rev=24 + I appearance/color/layer[5] = #000201 <> conf_rev=24 Index: trunk/tests/conf/tests/arr_set.ref =================================================================== --- trunk/tests/conf/tests/arr_set.ref (revision 30395) +++ trunk/tests/conf/tests/arr_set.ref (revision 30396) @@ -1,37 +1,37 @@ === initial state: empty === I appearance/color/layer[] = === append two items === - I appearance/color/layer[0] = #000001 <:0>> conf_rev=1 - I appearance/color/layer[0] = #000001 <:0>> conf_rev=2 - I appearance/color/layer[1] = #000002 <:0>> conf_rev=2 + I appearance/color/layer[0] = #000001 <:0>> conf_rev=4 + I appearance/color/layer[0] = #000001 <:0>> conf_rev=5 + I appearance/color/layer[1] = #000002 <:0>> conf_rev=5 === prepend two items === - I appearance/color/layer[0] = #000003 <:0>> conf_rev=3 - I appearance/color/layer[1] = #000001 <:0>> conf_rev=3 - I appearance/color/layer[2] = #000002 <:0>> conf_rev=3 - I appearance/color/layer[0] = #000004 <:0>> conf_rev=4 - I appearance/color/layer[1] = #000003 <:0>> conf_rev=4 - I appearance/color/layer[2] = #000001 <:0>> conf_rev=4 - I appearance/color/layer[3] = #000002 <:0>> conf_rev=4 -=== overwrite item === - I appearance/color/layer[0] = #000004 <:0>> conf_rev=6 - I appearance/color/layer[1] = #000005 <:0>> conf_rev=6 - I appearance/color/layer[2] = #000001 <:0>> conf_rev=6 - I appearance/color/layer[3] = #000002 <:0>> conf_rev=6 + I appearance/color/layer[0] = #000003 <:0>> conf_rev=6 + I appearance/color/layer[1] = #000001 <:0>> conf_rev=6 + I appearance/color/layer[2] = #000002 <:0>> conf_rev=6 I appearance/color/layer[0] = #000004 <:0>> conf_rev=7 - I appearance/color/layer[1] = #000005 <:0>> conf_rev=7 + I appearance/color/layer[1] = #000003 <:0>> conf_rev=7 I appearance/color/layer[2] = #000001 <:0>> conf_rev=7 I appearance/color/layer[3] = #000002 <:0>> conf_rev=7 - I appearance/color/layer[4] = #000006 <:0>> conf_rev=7 - I appearance/color/layer[0] = #000004 <:0>> conf_rev=8 - I appearance/color/layer[1] = #000005 <:0>> conf_rev=8 - I appearance/color/layer[2] = #000001 <:0>> conf_rev=8 - I appearance/color/layer[3] = #000002 <:0>> conf_rev=8 - I appearance/color/layer[4] = #000006 <:0>> conf_rev=8 - I appearance/color/layer[5] = <> conf_rev=8 - I appearance/color/layer[6] = <> conf_rev=8 - I appearance/color/layer[7] = #000007 <:0>> conf_rev=8 +=== overwrite item === + I appearance/color/layer[0] = #000004 <:0>> conf_rev=12 + I appearance/color/layer[1] = #000005 <:0>> conf_rev=12 + I appearance/color/layer[2] = #000001 <:0>> conf_rev=12 + I appearance/color/layer[3] = #000002 <:0>> conf_rev=12 + I appearance/color/layer[0] = #000004 <:0>> conf_rev=13 + I appearance/color/layer[1] = #000005 <:0>> conf_rev=13 + I appearance/color/layer[2] = #000001 <:0>> conf_rev=13 + I appearance/color/layer[3] = #000002 <:0>> conf_rev=13 + I appearance/color/layer[4] = #000006 <:0>> conf_rev=13 + I appearance/color/layer[0] = #000004 <:0>> conf_rev=14 + I appearance/color/layer[1] = #000005 <:0>> conf_rev=14 + I appearance/color/layer[2] = #000001 <:0>> conf_rev=14 + I appearance/color/layer[3] = #000002 <:0>> conf_rev=14 + I appearance/color/layer[4] = #000006 <:0>> conf_rev=14 + I appearance/color/layer[5] = <> conf_rev=14 + I appearance/color/layer[6] = <> conf_rev=14 + I appearance/color/layer[7] = #000007 <:0>> conf_rev=14 === overwrite array === - I appearance/color/layer[0] = #000008 <:0>> conf_rev=10 - I appearance/color/layer[1] = #000003 <:0>> conf_rev=10 - I appearance/color/layer[2] = #000001 <:0>> conf_rev=10 - I appearance/color/layer[3] = #000002 <:0>> conf_rev=10 + I appearance/color/layer[0] = #000008 <:0>> conf_rev=19 + I appearance/color/layer[1] = #000003 <:0>> conf_rev=19 + I appearance/color/layer[2] = #000001 <:0>> conf_rev=19 + I appearance/color/layer[3] = #000002 <:0>> conf_rev=19 Index: trunk/tests/conf/tests/list_merge.ref =================================================================== --- trunk/tests/conf/tests/list_merge.ref (revision 30395) +++ trunk/tests/conf/tests/list_merge.ref (revision 30396) @@ -2,12 +2,12 @@ I rc/library_search_paths = <> conf_rev=0 === import 3 levels === Result: 0 - I rc/library_search_paths = {sys1 <>;sys2 <>;} <> conf_rev=1 + I rc/library_search_paths = {sys1 <>;sys2 <>;} <> conf_rev=4 Result: 0 - I rc/library_search_paths = {user1 <>;user2 <>;} <> conf_rev=2 + I rc/library_search_paths = {user1 <>;user2 <>;} <> conf_rev=8 Result: 0 - I rc/library_search_paths = {design1 <>;design2 <>;} <> conf_rev=3 + I rc/library_search_paths = {design1 <>;design2 <>;} <> conf_rev=12 === change policies === - I rc/library_search_paths = {design1 <>;design2 <>;user1 <>;user2 <>;} <> conf_rev=4 - I rc/library_search_paths = {design1 <>;design2 <>;sys1 <>;sys2 <>;user1 <>;user2 <>;} <> conf_rev=5 - I rc/library_search_paths = {sys1 <>;sys2 <>;user1 <>;user2 <>;design1 <>;design2 <>;} <> conf_rev=6 + I rc/library_search_paths = {design1 <>;design2 <>;user1 <>;user2 <>;} <> conf_rev=16 + I rc/library_search_paths = {design1 <>;design2 <>;sys1 <>;sys2 <>;user1 <>;user2 <>;} <> conf_rev=20 + I rc/library_search_paths = {sys1 <>;sys2 <>;user1 <>;user2 <>;design1 <>;design2 <>;} <> conf_rev=24 Index: trunk/tests/conf/tests/list_set.ref =================================================================== --- trunk/tests/conf/tests/list_set.ref (revision 30395) +++ trunk/tests/conf/tests/list_set.ref (revision 30396) @@ -1,10 +1,10 @@ === initial state: empty === I rc/library_search_paths = <> conf_rev=0 === append two items === - I rc/library_search_paths = {foo <:0>>;} <> conf_rev=1 - I rc/library_search_paths = {foo <:0>>;bar <:0>>;} <> conf_rev=2 + I rc/library_search_paths = {foo <:0>>;} <> conf_rev=4 + I rc/library_search_paths = {foo <:0>>;bar <:0>>;} <> conf_rev=5 === prepend two items === - I rc/library_search_paths = {pre1 <:0>>;foo <:0>>;bar <:0>>;} <> conf_rev=3 - I rc/library_search_paths = {pre2 <:0>>;pre1 <:0>>;foo <:0>>;bar <:0>>;} <> conf_rev=4 + I rc/library_search_paths = {pre1 <:0>>;foo <:0>>;bar <:0>>;} <> conf_rev=6 + I rc/library_search_paths = {pre2 <:0>>;pre1 <:0>>;foo <:0>>;bar <:0>>;} <> conf_rev=7 === overwrite === - I rc/library_search_paths = {new <:0>>;} <> conf_rev=6 + I rc/library_search_paths = {new <:0>>;} <> conf_rev=12