diff options
| author | Dmitri Pal <dpal@redhat.com> | 2009-02-24 13:52:53 -0500 |
|---|---|---|
| committer | Dmitri Pal <dpal@redhat.com> | 2009-02-24 13:52:53 -0500 |
| commit | 27d15caafe401160fcc62829a3460a52cd45d429 (patch) | |
| tree | fb86574351e262937355b48959c9ca73889fae0d /collection | |
| parent | ef8d8570dcf44d723868df339223b132b19121c3 (diff) | |
| download | elapi_draft-27d15caafe401160fcc62829a3460a52cd45d429.tar.gz elapi_draft-27d15caafe401160fcc62829a3460a52cd45d429.tar.xz elapi_draft-27d15caafe401160fcc62829a3460a52cd45d429.zip | |
Adding missed commits.
Diffstat (limited to 'collection')
| -rw-r--r-- | collection/Makefile.am | 10 | ||||
| -rw-r--r-- | collection/elapi_collection_ut.c | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/collection/Makefile.am b/collection/Makefile.am index 6c33534..3cad327 100644 --- a/collection/Makefile.am +++ b/collection/Makefile.am @@ -1,6 +1,10 @@ -lib_LIBRARIES = libelapi_collection.a -libelapi_collection_a_SOURCES = elapi_collection.c elapi_util.c +DEBUG_FLAGS=@DEBUG_VAR@ + +AM_CPPFLAGS = -I/usr/include/libxml2 $(DEBUG_FLAGS) +topdir=.. +noinst_LIBRARIES = libelapi_collection.a +libelapi_collection_a_SOURCES = elapi_collection.c elapi_util.c elapi_tools.c elapi_collection.h elapi_util.h elapi_debug.h elapi_tools.h noinst_PROGRAMS = elapi_collection_ut elapi_collection_ut_SOURCES = elapi_collection_ut.c -elapi_collection_ut_LDADD = libelapi_collection.a -lm -lz -lxml2 libelapi_tools.a +elapi_collection_ut_LDADD = libelapi_collection.a -lm -lz -lxml2 diff --git a/collection/elapi_collection_ut.c b/collection/elapi_collection_ut.c index 9ee5261..a7f55d5 100644 --- a/collection/elapi_collection_ut.c +++ b/collection/elapi_collection_ut.c @@ -483,8 +483,7 @@ int mixed_collection_test() /* Some negative tests */ /* Can't add attributes to the referenced collection */ error = add_int_property(event,"host","session",500); - if(error == 0) printf("Error was able to add property to referenced collection.\n"); - printf("Expected error %d\n",error); + if(error != 0) printf("Error was NOT able to add property to a referenced collection.\n"); printf("Attempt to delete non-existent property.\n"); |