DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let the "applets" test be stricter (thus failing for the moment)

Browse Source
This commit is contained in:
Pierre Pronchery 2013-10-26 19:34:02 +02:00
parent 968cf336a3
commit b177a6ecaf
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/applets.c
View File

@ -28,7 +28,8 @@
static int _applets(void);
static int _dlerror(char const * message, int ret);
static int _error(char const * message, int ret);
static int _error(char const * message, char const * error, int ret);
static int _perror(char const * message, int ret);
/* functions */
@ -50,7 +51,7 @@ static int _applets(void)
PanelAppletDefinition * pad;
if((dir = opendir(path)) == NULL)
return -_error("../src/applets", 1);
return -_perror("../src/applets", 1);
while((de = readdir(dir)) != NULL)
{
if((len = strlen(de->d_name)) < sizeof(ext))
@ -59,7 +60,7 @@ static int _applets(void)
continue;
if((s = malloc(sizeof(path) + len + 1)) == NULL)
{
ret += _error(de->d_name, 1);
ret += _perror(de->d_name, 1);
continue;
}
snprintf(s, sizeof(path) + len + 1, "%s/%s", path, de->d_name);
@ -71,8 +72,13 @@ static int _applets(void)
}
if((pad = dlsym(p, "applet")) == NULL)
ret += _dlerror(s, 1);
else if(pad->icon == NULL)
ret += _error(s, "No icon defined", 1);
else
printf("%s: %s\n", de->d_name, pad->name);
printf("\n%s: %s (%s)\n%s\n", de->d_name, pad->name,
pad->icon, (pad->description != NULL)
? pad->description
: "(no description)");
free(s);
dlclose(p);
}
@ -84,14 +90,25 @@ static int _applets(void)
/* dlerror */
static int _dlerror(char const * message, int ret)
{
fputs("applets: ", stderr);
fprintf(stderr, "%s: %s\n", message, dlerror());
return ret;
}
/* error */
static int _error(char const * message, int ret)
static int _error(char const * message, char const * error, int ret)
{
fputs("applets: ", stderr);
fprintf(stderr, "%s: %s\n", message, error);
return ret;
}
/* perror */
static int _perror(char const * message, int ret)
{
fputs("applets: ", stderr);
perror(message);
return ret;
}

5
tests/tests.sh
View File

@ -98,8 +98,9 @@ target="$1"
$DATE > "$target"
FAILED=
echo "Performing tests:" 1>&2
_test "applets"
#echo "Expected failures:" 1>&2
#_test "applets"
echo "Expected failures:" 1>&2
_fail "applets"
if [ -n "$FAILED" ]; then
echo "Failed tests:$FAILED" 1>&2
exit 2