Hi!
I've been playing with patch from Jiri that attempts to fix ftest03 and ftest07
segfault and find out that it was correct however was done against some older
ltp version. Attached patch is rebased against current git repository as well
as tested to fix this issue on SLES11.
Some background:
The only poissonned line in ftest03.c, respective ftest07.c is:
sprintf(fuss, "%s/ftest03.%d", getcwd(wdbuf, sizeof( wdbuf)), getpid());
Where we are trying to fill path to the current working directory into fuss
that is declared as 'char fuss[40];'. However it's better to remove all code to
creates temporary directory from these tests as this is allready done by
tst_tmpdir().
There is still a lot of duplicated/broken code in these tests but for
simplicity I will address them in separate patches (so that it's easier to
review them).
Signed-off-by: Cyril Hrubis [email protected]
--
Cyril Hrubis
[email protected]
diff --git a/testcases/kernel/fs/ftest/ftest01.c b/testcases/kernel/fs/ftest/ftest01.c
index c4dc5c8..41b14de 100644
--- a/testcases/kernel/fs/ftest/ftest01.c
+++ b/testcases/kernel/fs/ftest/ftest01.c
@@ -90,9 +90,6 @@ static int parent_pid;
static int pidlist[MAXCHILD];
static char test_name[2];
-static char fuss[40]; /* directory to do this in */
-static char homedir[200]; /* where we started */
-
static int local_flag;
int main(int ac, char *av[])
@@ -130,18 +127,8 @@ static void setup(void)
* Save starting directory.
*/
tst_tmpdir();
- getcwd(homedir, sizeof(homedir));
parent_pid = getpid();
- if (!fuss[0])
- sprintf(fuss, "./ftest1.%d", getpid());
-
- mkdir(fuss, 0755);
-
- if (chdir(fuss) < 0) {
- tst_brkm(TBROK,0,"Can't chdir(%s): %s", fuss, strerror(errno));
- }
-
/*
* Default values for run conditions.
*/
@@ -162,16 +149,16 @@ static void setup(void)
static void runtest(void)
{
- int i, pid, child, status, count;
+ int i, child, status, count;
- for(i = 0; i < nchild; i++) {
+ for (i = 0; i < nchild; i++) {
test_name[0] = 'a' + i;
test_name[1] = '\0';
fd = open(test_name, O_RDWR|O_CREAT|O_TRUNC, 0666);
if (fd < 0)
- tst_brkm(TBROK,0, "Can't creating %s/%s: %s", fuss, test_name, strerror(errno));
+ tst_brkm(TBROK,0, "Can't creating %s: %s", test_name, strerror(errno));
if ((child = fork()) == 0) {
dotest(nchild, i, fd);
@@ -221,29 +208,6 @@ static void runtest(void)
else
tst_resm(TFAIL, "Test failed in fork and wait.");
- chdir(homedir);
- pid = fork();
-
- if (pid < 0) {
-
- tst_resm(TINFO, "System resource may be too low, fork() malloc()"
- " etc are likely to fail.");
-
- tst_resm(TBROK, "Can not remove '%s' due to inability of fork.",fuss);
- sync();
- tst_exit();
- }
-
- if (pid == 0) {
- execl("/bin/rm", "rm", "-rf", fuss, NULL);
- tst_exit();
- }
-
- wait(&status);
-
- if (status)
- tst_resm(TINFO, "CAUTION - ftest1, '%s' may not be removed", fuss);
-
sync();
}
diff --git a/testcases/kernel/fs/ftest/ftest03.c b/testcases/kernel/fs/ftest/ftest03.c
index 1cb6d6f..0f0eccc 100644
--- a/testcases/kernel/fs/ftest/ftest03.c
+++ b/testcases/kernel/fs/ftest/ftest03.c
@@ -96,12 +96,9 @@ static int parent_pid;
static int pidlist[MAXCHILD];
static char test_name[2]; /* childs test directory name */
-static char fuss[40]; /* directory to do this in */
-static char homedir[200]; /* where we started */
-
static int local_flag;
-int main (int ac, char *av[])
+int main(int ac, char *av[])
{
int lc;
char *msg;
@@ -138,31 +135,14 @@ int main (int ac, char *av[])
static void setup(void)
{
- char wdbuf[MAXPATHLEN];
-
/*
* Make a directory to do this in; ignore error if already exists.
* Save starting directory.
*/
tst_tmpdir();
- if (getcwd(homedir, sizeof(homedir)) == NULL) {
- tst_resm(TBROK, "getcwd() failed");
- tst_exit();
- }
-
parent_pid = getpid();
- if (!fuss[0])
- sprintf(fuss, "%s/ftest03.%d", getcwd(wdbuf, sizeof( wdbuf)), getpid());
-
- mkdir(fuss, 0755);
-
- if (chdir(fuss) < 0) {
- tst_resm(TBROK,"\tCan't chdir(%s), error %d.", fuss, errno);
- tst_exit() ;
- }
-
/*
* Default values for run conditions.
*/
@@ -181,9 +161,9 @@ static void setup(void)
static void runtest(void)
{
- int i, pid, child, status, count;
+ int i, child, status, count;
- for(i = 0; i < nchild; i++) {
+ for (i = 0; i < nchild; i++) {
test_name[0] = 'a' + i;
test_name[1] = '\0';
@@ -191,7 +171,7 @@ static void runtest(void)
fd = open(test_name, O_RDWR|O_CREAT|O_TRUNC, 0666);
if (fd < 0) {
- tst_resm(TBROK, "\tError %d creating %s/%s.", errno, fuss, test_name);
+ tst_resm(TBROK, "Error %d creating %s.", errno, test_name);
tst_exit();
}
@@ -241,30 +221,6 @@ static void runtest(void)
local_flag = FAILED;
}
- chdir(homedir);
-
- pid = fork();
-
- if (pid < 0) {
- tst_resm(TINFO, "System resource may be too low, fork() malloc()"
- " etc are likely to fail.");
- tst_resm(TBROK, "Test broken due to inability of fork.");
- sync();
- tst_exit();
- }
-
- if (pid == 0) {
- execl("/bin/rm", "rm", "-rf", fuss, NULL);
- tst_exit();
- } else
- wait(&status);
-
- if (status) {
- tst_resm(TINFO, "CAUTION - ftest03, '%s' may not be removed", fuss);
- tst_resm(TINFO, "CAUTION - ftest03, '%s' may not be removed",
- fuss);
- }
-
sync();
}
diff --git a/testcases/kernel/fs/ftest/ftest05.c b/testcases/kernel/fs/ftest/ftest05.c
index 220d9fd..3c66ab0 100644
--- a/testcases/kernel/fs/ftest/ftest05.c
+++ b/testcases/kernel/fs/ftest/ftest05.c
@@ -94,9 +94,6 @@ static int parent_pid;
static int pidlist[MAXCHILD];
static char test_name[2]; /* childs test directory name */
-static char fuss[40]; /* directory to do this in */
-static char homedir[200]; /* where we started */
-
static int local_flag;
int main(int ac, char *av[])
@@ -135,19 +132,9 @@ static void setup(void)
* Save starting directory.
*/
tst_tmpdir();
- getcwd(homedir, sizeof (homedir));
+
parent_pid = getpid();
- if (!fuss[0])
- sprintf(fuss, "./ftest05.%d", getpid());
-
- mkdir(fuss, 0755);
-
- if (chdir(fuss) < 0) {
- tst_resm(TBROK,"\tCan't chdir(%s), error %d.", fuss, errno);
- tst_exit();
- }
-
/*
* Default values for run conditions.
*/
@@ -167,7 +154,7 @@ static void setup(void)
static void runtest(void)
{
- int i, pid, child, status, count;
+ int i, child, status, count;
for (i = 0; i < nchild; i++) {
test_name[0] = 'a' + i;
@@ -175,7 +162,7 @@ static void runtest(void)
fd = open(test_name, O_RDWR|O_CREAT|O_TRUNC, 0666);
if (fd < 0) {
- tst_resm(TBROK, "\tError %d creating %s/%s.", errno, fuss, test_name);
+ tst_resm(TBROK, "Error %d creating %s.", errno, test_name);
tst_exit();
}
@@ -221,28 +208,6 @@ static void runtest(void)
local_flag = FAILED;
}
- chdir(homedir);
- pid = fork();
-
- if (pid < 0) {
- tst_resm(TINFO, "System resource may be too low, fork() malloc()"
- " etc are likely to fail.");
- tst_resm(TBROK, "Test broken due to inability of fork.");
- sync();
- tst_exit();
- }
-
- if (pid == 0) {
- execl("/bin/rm", "rm", "-rf", fuss, NULL);
- tst_exit();
- }
-
- wait(&status);
-
- if (status) {
- tst_resm(TINFO,"CAUTION - ftest05, '%s' may not be removed", fuss);
- }
-
sync();
}
diff --git a/testcases/kernel/fs/ftest/ftest07.c b/testcases/kernel/fs/ftest/ftest07.c
index 8cda511..ef42daf 100644
--- a/testcases/kernel/fs/ftest/ftest07.c
+++ b/testcases/kernel/fs/ftest/ftest07.c
@@ -86,6 +86,7 @@ int TST_TOTAL = 1;
#define MAXIOVCNT 16
static void setup(void);
+static void cleanup(void);
static void runtest(void);
static void dotest(int, int, int);
static void domisc(int, int, char*);
@@ -102,9 +103,6 @@ static int parent_pid;
static int pidlist[MAXCHILD];
static char test_name[2]; /* childs test directory name */
-static char fuss[40]; /* directory to do this in */
-static char homedir[200]; /* where we started */
-
static int local_flag;
int main(int ac, char *av[])
@@ -141,58 +139,45 @@ int main(int ac, char *av[])
return 0;
}
-static void setup(void)
+static void cleanup(void)
{
- char wdbuf[MAXPATHLEN], *cwd;
+ tst_rmdir();
+ tst_exit();
+}
+static void setup(void)
+{
/*
* Make a directory to do this in; ignore error if already exists.
* Save starting directory.
*/
- if ((cwd = getcwd(homedir, sizeof (homedir))) == NULL ) {
- tst_resm(TBROK,"Failed to get corrent directory") ;
- tst_exit();
- }
-
parent_pid = getpid();
tst_tmpdir();
- if (!fuss[0])
- sprintf(fuss, "%s/ftest07.%d", getcwd(wdbuf, sizeof( wdbuf)), getpid());
-
- mkdir(fuss, 0755);
-
- if (chdir(fuss) < 0) {
- tst_resm(TBROK,"\tCan't chdir(%s), error %d.", fuss, errno);
- tst_exit() ;
- }
-
+
/*
* Default values for run conditions.
*/
-
iterations = 10;
nchild = 5;
csize = K_2; /* should run with 1, 2, and 4 K sizes */
max_size = K_1 * K_1;
misc_intvl = 10;
- if (sigset(SIGTERM, term) == SIG_ERR) {
- tst_resm(TBROK, " sigset failed: signo = 15") ;
- tst_exit() ;
- }
-
+ if (sigset(SIGTERM, term) == SIG_ERR)
+ tst_brkm(TBROK, cleanup, " sigset failed: signo = 15");
}
static void runtest(void)
{
- int pid, child, status, count, i;
+ int child, status, count, i;
for (i = 0; i < nchild; i++) {
test_name[0] = 'a' + i;
test_name[1] = '\0';
fd = open(test_name, O_RDWR|O_CREAT|O_TRUNC, 0666);
+
if (fd < 0) {
- tst_resm(TBROK, "\tError %d creating %s/%s.", errno, fuss, test_name);
+ tst_resm(TBROK, "Error %d creating %s.", errno, test_name);
tst_exit();
}
@@ -241,25 +226,6 @@ static void runtest(void)
local_flag = FAILED;
}
- chdir(homedir);
-
- pid = fork();
- if (pid < 0) {
- tst_resm(TINFO, "System resource may be too low, fork() malloc()"
- " etc are likely to fail.");
- tst_resm(TBROK, "Test broken due to inability of fork.");
- tst_exit();
- }
-
- if (pid == 0) {
- execl("/bin/rm", "rm", "-rf", fuss, NULL);
- exit(1);
- } else
- wait(&status);
- if (status) {
- tst_resm(TINFO, "CAUTION - ftest07, '%s' may not be removed", fuss);
- }
-
sync();
}
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
