[Tests] Fix window test.

This commit is contained in:
Dave Davenport 2018-07-10 13:53:40 +02:00
parent dd0ae5bda0
commit 09db7d5d3f
3 changed files with 11 additions and 4 deletions

View File

@ -54,7 +54,9 @@ typedef enum {
/** Parse a file */
PT_FILE,
/** Parse a string */
PT_STRING
PT_STRING,
/** Parse environment */
PT_ENV
} ParseType;
/**
@ -123,6 +125,7 @@ static double rofi_theme_parse_convert_hex ( char high, char low)
} \
break;\
}\
case PT_ENV:\
case PT_STRING:\
{\
yy_size_t len = MIN (max_size, current->str_len);\
@ -446,7 +449,7 @@ if ( queue == NULL ){
ParseObject *top = g_queue_peek_head ( file_queue );
top->location = *yylloc;
ParseObject *po = g_malloc0(sizeof(ParseObject));
po->type = PT_STRING;
po->type = PT_ENV;
po->input_str = val;
po->str_len = strlen(val);
current = po;

View File

@ -138,7 +138,7 @@ static void rofi_icon_fetcher_worker ( thread_state *sdata, G_GNUC_UNUSED gpoint
// as long as dr->icon is updated atomicly.. (is a pointer write atomic?)
// this should be fine running in another thread.
IconFetcherEntry *sentry = (IconFetcherEntry*) sdata;
const gchar *themes[1] = {
const gchar *themes[] = {
config.icon_theme,
NULL
};

View File

@ -29,10 +29,14 @@ if kill ${TPID}; then
wait ${TPID}
fi
if pgrep -u $USER xterm
if ps -q ${XPID} # pgrep -u $USER xterm
then
echo "Found remaining xterms: $(pgrep -u $USER xterm)"
kill ${XPID}
fi
if ps -q ${RPID}
then
echo "Rofi still running"
kill ${RPID}
exit 1
fi