emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make xbps_find_virtualpkg_conf_in_xxx_by_xxx part of the API and add kyua tests.

Browse Source
This commit is contained in:
Juan RP 2012-03-12 17:51:50 +01:00
parent 715990a1e5
commit 749e03aa29
10 changed files with 283 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/xbps_api.h
View File

@ -56,7 +56,7 @@
*/
#define XBPS_PKGINDEX_VERSION "1.4"
#define XBPS_API_VERSION "20120312"
#define XBPS_API_VERSION "20120312-1"
#define XBPS_VERSION "0.15"
/**
@ -1088,6 +1088,42 @@ prop_dictionary_t xbps_find_virtualpkg_in_array_by_name(prop_array_t array,
*/
prop_dictionary_t xbps_find_virtualpkg_in_array_by_pattern(prop_array_t array,
const char *pattern);
/**
* Finds a package dictionary in a proplib array by matching a pkgname
* in \a name as set by the virtual package settings in xbps.conf.
*
* @param[in] array The proplib array to search on.
* @param[in] name The virtual package name to match.
*
* @return The package dictionary on match, otherwise NULL is returned.
*/
prop_dictionary_t xbps_find_virtualpkg_conf_in_array_by_name(prop_array_t array,
const char *name);
/**
* Finds a package dictionary in a proplib array by matching a pkgpattern
* in \a pattern as set by the virtual package settings in xbps.conf.
*
* @param[in] array The proplib array to search on.
* @param[in] pattern The virtual package pattern to match, i.e
* `foo>=0' or `foo<1'.
*
* @return The package dictionary on match, otherwise NULL is returned.
*/
prop_dictionary_t
xbps_find_virtualpkg_conf_in_array_by_pattern(prop_array_t array,
const char *pattern);
prop_dictionary_t
xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t d,
const char *key,
const char *name);
prop_dictionary_t
xbps_find_virtualpkg_conf_in_dict_by_pattern(prop_dictionary_t d,
const char *key,
const char *pattern);
/**
* Match a package name in the specified array of strings.
*

17
include/xbps_api_impl.h
View File

@ -159,23 +159,6 @@ int HIDDEN xbps_file_chdir_exec(const char *, const char *, ...);
*/
int HIDDEN xbps_transaction_package_replace(prop_dictionary_t);
/**
* @private
* From lib/plist_find.c
*/
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_array_by_name(prop_array_t, const char *);
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t,
const char *,
const char *);
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_array_by_pattern(prop_array_t,
const char *);
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_dict_by_pattern(prop_dictionary_t,
const char *,
const char *);
/**
* @private
* From lib/cb_util.c

8
lib/plist_find.c
View File

@ -211,13 +211,13 @@ find_virtualpkg_user_in_array(prop_array_t array,
return find_pkg_in_array(array, vpkgname, false, false);
}
prop_dictionary_t HIDDEN
prop_dictionary_t
xbps_find_virtualpkg_conf_in_array_by_name(prop_array_t array, const char *name)
{
return find_virtualpkg_user_in_array(array, name, false);
}
prop_dictionary_t HIDDEN
prop_dictionary_t
xbps_find_virtualpkg_conf_in_array_by_pattern(prop_array_t array, const char *p)
{
return find_virtualpkg_user_in_array(array, p, true);
@ -312,7 +312,7 @@ xbps_find_virtualpkg_in_dict_by_pattern(prop_dictionary_t d,
return find_pkg_in_dict(d, key, pattern, true, true);
}
prop_dictionary_t HIDDEN
prop_dictionary_t
xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t d,
const char *key,
const char *name)
@ -320,7 +320,7 @@ xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t d,
return find_virtualpkg_user_in_dict(d, key, name, false);
}
prop_dictionary_t HIDDEN
prop_dictionary_t
xbps_find_virtualpkg_conf_in_dict_by_pattern(prop_dictionary_t d,
const char *key,
const char *pattern)

5
mk/test.mk
View File

@ -13,6 +13,11 @@ clean:
install: all
install -d $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
install -m755 $(TEST) $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
ifdef EXTRA_FILES
for f in $(EXTRA_FILES); do \
install -m644 $${f} $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR); \
done
endif
.PHONY: uninstall
uninstall:

1
tests/libxbps/Makefile
View File

@ -11,5 +11,6 @@ SUBDIRS += plist_match
SUBDIRS += plist_match_virtual
SUBDIRS += plist_remove
SUBDIRS += util
SUBDIRS += plist_find_virtualpkg_conf
include ../../mk/subdir.mk

2
tests/libxbps/common/Kyuafile
View File

@ -11,3 +11,5 @@ atf_test_program{name="plist_match_test"}
atf_test_program{name="plist_match_virtual_test"}
atf_test_program{name="plist_remove_test"}
atf_test_program{name="plist_array_replace_test"}
include("plist_find_virtualpkg_conf/Kyuafile")

6
tests/libxbps/plist_find_virtualpkg_conf/Kyuafile Normal file
View File

@ -0,0 +1,6 @@
syntax("kyuafile", 1)
test_suite("libxbps")
atf_test_program{name="plist_find_virtualpkg_conf_test"}

8
tests/libxbps/plist_find_virtualpkg_conf/Makefile Normal file
View File

@ -0,0 +1,8 @@
TOPDIR = ../../..
-include $(TOPDIR)/config.mk
TESTSSUBDIR = libxbps/plist_find_virtualpkg_conf
TEST = plist_find_virtualpkg_conf_test
EXTRA_FILES = Kyuafile xbps.conf
include $(TOPDIR)/mk/test.mk

219
tests/libxbps/plist_find_virtualpkg_conf/main.c Normal file
View File

@ -0,0 +1,219 @@
/*-
* Copyright (c) 2012 Juan Romero Pardines.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*-
*/
#include <string.h>
#include <atf-c.h>
#include <xbps_api.h>
static const char dictxml[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
"<plist version=\"1.0\">\n"
"<dict>\n"
" <key>packages</key>\n"
" <array>\n"
" <dict>\n"
" <key>pkgname</key>\n"
" <string>xbps-src-git</string>\n"
" <key>version</key>\n"
" <string>20120311</string>\n"
" <key>pkgver</key>\n"
" <string>xbps-src-git-20120311</string>\n"
" <key>provides</key>\n"
" <array>\n"
" <string>xbps-src-24</string>\n"
" </array>\n"
" </dict>\n"
" <dict>\n"
" <key>pkgname</key>\n"
" <string>xbps-src</string>\n"
" <key>version</key>\n"
" <string>24</string>\n"
" <key>pkgver</key>\n"
" <string>xbps-src-24</string>\n"
" </dict>\n"
" </array>\n"
"</dict>\n"
"</plist>\n";
ATF_TC(find_virtualpkg_conf_in_array_by_name_test);
ATF_TC_HEAD(find_virtualpkg_conf_in_array_by_name_test, tc)
{
atf_tc_set_md_var(tc, "descr", "Test xbps_find_virtualpkg_conf_in_array_by_name");
}
ATF_TC_BODY(find_virtualpkg_conf_in_array_by_name_test, tc)
{
struct xbps_handle xh;
prop_array_t a;
prop_dictionary_t d, dr;
const char *pkgver, *tcsdir;
char *cffile;
/* get test source dir */
tcsdir = atf_tc_get_config_var(tc, "srcdir");
cffile = xbps_xasprintf("%s/xbps.conf", tcsdir);
ATF_REQUIRE(cffile != NULL);
/* initialize xbps */
memset(&xh, 0, sizeof(xh));
xh.rootdir = "/tmp";
xh.conffile = cffile;
ATF_REQUIRE_EQ(xbps_init(&xh), 0);
d = prop_dictionary_internalize(dictxml);
ATF_REQUIRE_EQ(prop_object_type(d), PROP_TYPE_DICTIONARY);
a = prop_dictionary_get(d, "packages");
ATF_REQUIRE_EQ(prop_object_type(a), PROP_TYPE_ARRAY);
dr = xbps_find_virtualpkg_conf_in_array_by_name(a, "xbps-src");
ATF_REQUIRE_EQ(prop_object_type(dr), PROP_TYPE_DICTIONARY);
prop_dictionary_get_cstring_nocopy(dr, "pkgver", &pkgver);
ATF_REQUIRE_STREQ(pkgver, "xbps-src-git-20120311");
xbps_end();
}
ATF_TC(find_virtualpkg_conf_in_array_by_pattern_test);
ATF_TC_HEAD(find_virtualpkg_conf_in_array_by_pattern_test, tc)
{
atf_tc_set_md_var(tc, "descr", "Test xbps_find_virtualpkg_conf_in_array_by_pattern");
}
ATF_TC_BODY(find_virtualpkg_conf_in_array_by_pattern_test, tc)
{
struct xbps_handle xh;
prop_array_t a;
prop_dictionary_t d, dr;
const char *pkgver, *tcsdir;
char *cffile;
/* get test source dir */
tcsdir = atf_tc_get_config_var(tc, "srcdir");
cffile = xbps_xasprintf("%s/xbps.conf", tcsdir);
ATF_REQUIRE(cffile != NULL);
/* initialize xbps */
memset(&xh, 0, sizeof(xh));
xh.rootdir = "/tmp";
xh.conffile = cffile;
ATF_REQUIRE_EQ(xbps_init(&xh), 0);
d = prop_dictionary_internalize(dictxml);
ATF_REQUIRE_EQ(prop_object_type(d), PROP_TYPE_DICTIONARY);
a = prop_dictionary_get(d, "packages");
ATF_REQUIRE_EQ(prop_object_type(a), PROP_TYPE_ARRAY);
dr = xbps_find_virtualpkg_conf_in_array_by_pattern(a, "xbps-src>=24");
ATF_REQUIRE_EQ(prop_object_type(dr), PROP_TYPE_DICTIONARY);
prop_dictionary_get_cstring_nocopy(dr, "pkgver", &pkgver);
ATF_REQUIRE_STREQ(pkgver, "xbps-src-git-20120311");
dr = xbps_find_virtualpkg_conf_in_array_by_pattern(a, "xbps-src>=25");
ATF_REQUIRE(dr == NULL);
xbps_end();
}
ATF_TC(find_virtualpkg_conf_in_dict_by_name_test);
ATF_TC_HEAD(find_virtualpkg_conf_in_dict_by_name_test, tc)
{
atf_tc_set_md_var(tc, "descr", "Test xbps_find_virtualpkg_conf_in_dict_by_name");
}
ATF_TC_BODY(find_virtualpkg_conf_in_dict_by_name_test, tc)
{
struct xbps_handle xh;
prop_dictionary_t d, dr;
const char *pkgver, *tcsdir;
char *cffile;
/* get test source dir */
tcsdir = atf_tc_get_config_var(tc, "srcdir");
cffile = xbps_xasprintf("%s/xbps.conf", tcsdir);
ATF_REQUIRE(cffile != NULL);
/* initialize xbps */
memset(&xh, 0, sizeof(xh));
xh.rootdir = "/tmp";
xh.conffile = cffile;
ATF_REQUIRE_EQ(xbps_init(&xh), 0);
d = prop_dictionary_internalize(dictxml);
ATF_REQUIRE_EQ(prop_object_type(d), PROP_TYPE_DICTIONARY);
dr = xbps_find_virtualpkg_conf_in_dict_by_name(d, "packages", "xbps-src");
ATF_REQUIRE_EQ(prop_object_type(dr), PROP_TYPE_DICTIONARY);
prop_dictionary_get_cstring_nocopy(dr, "pkgver", &pkgver);
ATF_REQUIRE_STREQ(pkgver, "xbps-src-git-20120311");
xbps_end();
}
ATF_TC(find_virtualpkg_conf_in_dict_by_pattern_test);
ATF_TC_HEAD(find_virtualpkg_conf_in_dict_by_pattern_test, tc)
{
atf_tc_set_md_var(tc, "descr", "Test xbps_find_virtualpkg_conf_in_pattern_by_name");
}
ATF_TC_BODY(find_virtualpkg_conf_in_dict_by_pattern_test, tc)
{
struct xbps_handle xh;
prop_dictionary_t d, dr;
const char *pkgver, *tcsdir;
char *cffile;
/* get test source dir */
tcsdir = atf_tc_get_config_var(tc, "srcdir");
cffile = xbps_xasprintf("%s/xbps.conf", tcsdir);
ATF_REQUIRE(cffile != NULL);
/* initialize xbps */
memset(&xh, 0, sizeof(xh));
xh.rootdir = "/tmp";
xh.conffile = cffile;
ATF_REQUIRE_EQ(xbps_init(&xh), 0);
d = prop_dictionary_internalize(dictxml);
ATF_REQUIRE_EQ(prop_object_type(d), PROP_TYPE_DICTIONARY);
dr = xbps_find_virtualpkg_conf_in_dict_by_pattern(d, "packages", "xbps-src>=24");
ATF_REQUIRE_EQ(prop_object_type(dr), PROP_TYPE_DICTIONARY);
prop_dictionary_get_cstring_nocopy(dr, "pkgver", &pkgver);
ATF_REQUIRE_STREQ(pkgver, "xbps-src-git-20120311");
dr = xbps_find_virtualpkg_conf_in_dict_by_pattern(d, "packages", "xbps-src>=25");
ATF_REQUIRE(dr == NULL);
xbps_end();
}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, find_virtualpkg_conf_in_array_by_name_test);
ATF_TP_ADD_TC(tp, find_virtualpkg_conf_in_array_by_pattern_test);
ATF_TP_ADD_TC(tp, find_virtualpkg_conf_in_dict_by_name_test);
ATF_TP_ADD_TC(tp, find_virtualpkg_conf_in_dict_by_pattern_test);
return atf_no_error();
}

1
tests/libxbps/plist_find_virtualpkg_conf/xbps.conf Normal file
View File

@ -0,0 +1 @@
virtual-package xbps-src-git { targets = "xbps-src-24" }