1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00

Merge branch 'master' into openpgp

This commit is contained in:
James Booth 2015-06-06 23:07:44 +01:00
commit e8095a1b96

View File

@ -160,12 +160,14 @@ init_prof_test(void **state)
void void
close_prof_test(void **state) close_prof_test(void **state)
{ {
prof_input("/quit");
waitpid(exp_pid, NULL, 0);
stbbr_stop();
_cleanup_dirs(); _cleanup_dirs();
setenv("XDG_CONFIG_HOME", config_orig, 1); setenv("XDG_CONFIG_HOME", config_orig, 1);
setenv("XDG_DATA_HOME", data_orig, 1); setenv("XDG_DATA_HOME", data_orig, 1);
stbbr_stop();
} }
void void