shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

TEST: Add a timeout to the harness, killing tests after 2 minutes.

Browse Source
This commit is contained in:
Petr Rockai 2013-07-23 11:42:34 +02:00
parent e72b2d047d
commit 9a1da7b262
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
test/lib/harness.c
View File

@ -71,11 +71,12 @@ enum {
WARNED, WARNED,
KNOWNFAIL, KNOWNFAIL,
INTERRUPTED, INTERRUPTED,
TIMEOUT,
}; };
static void handler( int sig ) { static void handler( int sig ) {
signal( sig, SIG_DFL ); signal( sig, SIG_DFL );
kill( pid, sig ); kill( -pid, sig );
die = sig; die = sig;
} }
@ -169,7 +170,7 @@ static void _append_buf(const char *buf, size_t len)
if ((readbuf_sz >= MAX_LOG_SIZE) && if ((readbuf_sz >= MAX_LOG_SIZE) &&
!getenv("LVM_TEST_UNLIMITED")) { !getenv("LVM_TEST_UNLIMITED")) {
if (fullbuffer++ == 0) if (fullbuffer++ == 0)
kill(pid, SIGINT); kill(-pid, SIGINT);
return; return;
} }
readbuf_sz = readbuf_sz ? 2 * readbuf_sz : 4096; readbuf_sz = readbuf_sz ? 2 * readbuf_sz : 4096;
@ -293,6 +294,17 @@ static void interrupted(int i, char *f) {
} }
} }
static void timeout(int i, char *f) {
++ s.ninterrupted;
s.status[i] = TIMEOUT;
printf("timeout.\n");
if (!verbose && readbuf) {
printf("-- Timed out %s ------------------------------------\n", f);
dump();
printf("\n-- Timed out %s (end) ------------------------------\n", f);
}
}
static void skipped(int i, char *f) { static void skipped(int i, char *f) {
++ s.nskipped; ++ s.nskipped;
s.status[i] = SKIPPED; s.status[i] = SKIPPED;
@ -341,6 +353,7 @@ static void run(int i, char *f) {
} else { } else {
strcpy(script, f); strcpy(script, f);
} }
setpgid(0, 0);
execlp("bash", "bash", "-noprofile", "-norc", script, NULL); execlp("bash", "bash", "-noprofile", "-norc", script, NULL);
perror("execlp"); perror("execlp");
fflush(stderr); fflush(stderr);
@ -351,8 +364,9 @@ static void run(int i, char *f) {
char buf[128]; char buf[128];
char outpath[PATH_MAX]; char outpath[PATH_MAX];
char *c = outpath + strlen(results) + 1; char *c = outpath + strlen(results) + 1;
struct timeval timeout; struct timeval selectwait;
fd_set master_set, copy_set; fd_set master_set, copy_set;
int runaway = 0;
snprintf(buf, sizeof(buf), "%s ...", f); snprintf(buf, sizeof(buf), "%s ...", f);
printf("Running %-60s ", buf); printf("Running %-60s ", buf);
@ -366,13 +380,24 @@ static void run(int i, char *f) {
FD_ZERO(&master_set); FD_ZERO(&master_set);
FD_SET(fds[1], &master_set); FD_SET(fds[1], &master_set);
while ((w = wait4(pid, &st, WNOHANG, &usage)) == 0) { while ((w = wait4(pid, &st, WNOHANG, &usage)) == 0) {
if (fullbuffer && fullbuffer++ == 8000) if ((fullbuffer && fullbuffer++ == 8000) ||
/* Output doesn't won't to stop... */ time(NULL) - start > 120) // a 2 minute timeout
kill(pid, SIGKILL); {
kill(-pid, SIGINT);
sleep(5); /* wait a bit for a reaction */
if ((w = waitpid(pid, &st, WNOHANG)) == 0) {
kill(-pid, SIGKILL);
w = waitpid(pid, &st, NULL);
}
drain();
runaway = 1;
break;
}
memcpy(&copy_set, &master_set, sizeof(master_set)); memcpy(&copy_set, &master_set, sizeof(master_set));
timeout.tv_sec = 0; selectwait.tv_sec = 0;
timeout.tv_usec = 500000; selectwait.tv_usec = 500000;
if (select(fds[1] + 1, &copy_set, NULL, NULL, &timeout) <= 0) if (select(fds[1] + 1, &copy_set, NULL, NULL, &selectwait) <= 0)
continue; continue;
drain(); drain();
} }
@ -381,9 +406,11 @@ static void run(int i, char *f) {
exit(206); exit(206);
} }
drain(); drain();
if (fullbuffer || (die == 2)) if (die == 2)
interrupted(i, f); interrupted(i, f);
else if (WIFEXITED(st)) { else if (runaway) {
timeout(i, f);
} else if (WIFEXITED(st)) {
if (WEXITSTATUS(st) == 0) if (WEXITSTATUS(st) == 0)
passed(i, f, start, &usage); passed(i, f, start, &usage);
else if (WEXITSTATUS(st) == 200) else if (WEXITSTATUS(st) == 200)
@ -467,6 +494,7 @@ int main(int argc, char **argv) {
case FAILED: result = "failed"; break; case FAILED: result = "failed"; break;
case SKIPPED: result = "skipped"; break; case SKIPPED: result = "skipped"; break;
case WARNED: result = "warnings"; break; case WARNED: result = "warnings"; break;
case TIMEOUT: result = "timeout"; break;
case INTERRUPTED: result = "interrupted"; break; case INTERRUPTED: result = "interrupted"; break;
default: result = "unknown"; break; default: result = "unknown"; break;
} }