aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Merge branch 'master' into plugins

Browse Source 
Conflicts:
	configure.ac
This commit is contained in:
James Booth 2014-02-12 21:18:59 +00:00
commit ea2a98cf6e
3 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -47,5 +47,6 @@ runvalgrind.sh
src/prof_config.h
clean.sh
valgrind.out.old
testsuite.out
tests/testsuite.trs
push-all.sh
.DS_Store

2
configure.ac
View File

@ -275,7 +275,7 @@ AC_CHECK_HEADERS([ncursesw/ncurses.h], [], [])
AC_CHECK_HEADERS([ncurses.h], [], [])
### Default parameters
AM_CFLAGS="-Wall -export-dynamic"
AM_CFLAGS="-Wall -Wno-deprecated-declarations -export-dynamic"
AS_IF([test "x$PACKAGE_STATUS" = xdevelopment],
[AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"])
AM_LDFLAGS="$AM_LDFLAGS $PYTHON_LDFLAGS $RUBY_LDFLAGS $LUA_LIB"

35
tests/testsuite.c
View File

@ -26,10 +26,6 @@
#include "test_cmd_bookmark.h"
#include "test_muc.h"
#define PROF_RUN_TESTS(name) fprintf(stderr, "\n-> Running %s\n", #name); \
fflush(stderr); \
result += run_tests(name);
int main(int argc, char* argv[]) {
const UnitTest all_tests[] = {
unit_test(replace_one_substr),
@ -429,34 +425,5 @@ int main(int argc, char* argv[]) {
unit_test(cmd_bookmark_remove_autojoin_shows_message_when_no_bookmark),
};
int bak, bak2, new;
fflush(stdout);
fflush(stderr);
bak = dup(1);
bak2 = dup(2);
remove("./testsuite.out");
new = open("./testsuite.out", O_WRONLY | O_CREAT);
chmod("./testsuite.out", S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
dup2(new, 1);
dup2(new, 2);
close(new);
int result = 0;
PROF_RUN_TESTS(all_tests);
fflush(stdout);
dup2(bak, 1);
dup2(bak2, 2);
close(bak);
close(bak2);
if (result > 0) {
printf("\n\nFAILED TESTS, see ./testsuite.out\n\n");
return 1;
} else {
printf("\n\nAll tests passed\n\n");
return 0;
}
return run_tests(all_tests);
}