Commit 0530b0a5 authored by Yang Tse's avatar Yang Tse
Browse files

Don't abort tests 518 and 537 when unable to raise the open-file soft limit

parent 53961215

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 


                                  Changelog



Yang Tse (17 Jan 2008)

- Don't abort tests 518 and 537 when unable to raise the open-file soft limit.



Daniel S (16 Jan 2008)

- Nathan Coulter's patch that makes runtests.pl respect the PATH when figuring

  out what valgrind to run.

tests/libtest/lib518.c

+16 −1
Original line number Diff line number Diff line
@@ -153,12 +153,27 @@ static int rlimit(int keep_open) 


  if (rl.rlim_cur != rl.rlim_max) {



#ifdef OPEN_MAX

    if ((rl.rlim_cur > 0) &&

        (rl.rlim_cur < OPEN_MAX)) {

      fprintf(stderr, "raising soft limit up to OPEN_MAX\n");

      rl.rlim_cur = OPEN_MAX;

      if (setrlimit(RLIMIT_NOFILE, &rl) != 0) {

        /* on failure don't abort just issue a warning */

        store_errmsg("setrlimit() failed", ERRNO);

        fprintf(stderr, "%s\n", msgbuff);

        msgbuff[0] = '\0';

      }

    }

#endif



    fprintf(stderr, "raising soft limit up to hard limit\n");

    rl.rlim_cur = rl.rlim_max;

    if (setrlimit(RLIMIT_NOFILE, &rl) != 0) {

      /* on failure don't abort just issue a warning */

      store_errmsg("setrlimit() failed", ERRNO);

      fprintf(stderr, "%s\n", msgbuff);

      return -2;

      msgbuff[0] = '\0';

    }



    /* get current open file limits */

tests/libtest/lib537.c

+16 −1
Original line number Diff line number Diff line
@@ -148,12 +148,27 @@ static int rlimit(int keep_open) 


  if (rl.rlim_cur != rl.rlim_max) {



#ifdef OPEN_MAX

    if ((rl.rlim_cur > 0) &&

        (rl.rlim_cur < OPEN_MAX)) {

      fprintf(stderr, "raising soft limit up to OPEN_MAX\n");

      rl.rlim_cur = OPEN_MAX;

      if (setrlimit(RLIMIT_NOFILE, &rl) != 0) {

        /* on failure don't abort just issue a warning */

        store_errmsg("setrlimit() failed", ERRNO);

        fprintf(stderr, "%s\n", msgbuff);

        msgbuff[0] = '\0';

      }

    }

#endif



    fprintf(stderr, "raising soft limit up to hard limit\n");

    rl.rlim_cur = rl.rlim_max;

    if (setrlimit(RLIMIT_NOFILE, &rl) != 0) {

      /* on failure don't abort just issue a warning */

      store_errmsg("setrlimit() failed", ERRNO);

      fprintf(stderr, "%s\n", msgbuff);

      return -2;

      msgbuff[0] = '\0';

    }



    /* get current open file limits */