Skip to contentSkip to conversation

testsuite: don't clobber /tmp

PATCH In review Matteo Croce 2 participants 8 messages Jun 11, 2019 – Oct 12, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 testsuite: don't clobber /tmp

Even if not running the testsuite, every build will leave
a stale tc_testkenv.* file in the system temp directory. Conditionally create the temp file only if we're running the testsuite.

---
 testsuite/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
testsuite/Makefile +4 -1
index 7f247bbc..5353244b 100644
@@ -14,7 +14,9 @@ TESTS_DIR := $(dir $(TESTS))
 
 IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*))
 
-KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+ifeq ($(MAKECMDGOALS),alltests)
+	KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+endif
 ifneq (,$(wildcard /proc/config.gz))
 	KCPATH := /proc/config.gz
 else
@@ -94,3 +96,4 @@ endif
 		rm "$$TMP_ERR" "$$TMP_OUT"; \
 		sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \
 	done
+	@$(RM) $(KENVFN)
Signature · 1 line
2.21.0
#1 lore raw
Quoted 25 lines · On Tue, 11 Jun 2019 20:03:26 +0200 Matteo Croce <[email protected]> wrote:

Even if not running the testsuite, every build will leave
a stale tc_testkenv.* file in the system temp directory. Conditionally create the temp file only if we're running the testsuite.

---
 testsuite/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
testsuite/Makefile +3 -1
index 7f247bbc..5353244b 100644
@@ -14,7 +14,9 @@ TESTS_DIR := $(dir $(TESTS))
 
 IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*))
 
-KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+ifeq ($(MAKECMDGOALS),alltests)
+	KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+endif
 ifneq (,$(wildcard /proc/config.gz))
 	KCPATH := /proc/config.gz
 else

testsuite/Makefile endif · line 99

Quoted 4 lines
testsuite/Makefile +1 -0
@@ -94,3 +96,4 @@ endif
 		rm "$$TMP_ERR" "$$TMP_OUT"; \
 		sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \
 	done
+	@$(RM) $(KENVFN)

My concern is that there are several targets in this one Makefile.

Why not use -u which gives name but does not create the file?

#2 lore raw
Quoted 36 lines · Stephen Hemminger
Quoted 25 lines · On Tue, 11 Jun 2019 20:03:26 +0200 Matteo Croce <[email protected]> wrote:

Even if not running the testsuite, every build will leave
a stale tc_testkenv.* file in the system temp directory. Conditionally create the temp file only if we're running the testsuite.

---
 testsuite/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
testsuite/Makefile +3 -1
index 7f247bbc..5353244b 100644
@@ -14,7 +14,9 @@ TESTS_DIR := $(dir $(TESTS))
 
 IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*))
 
-KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+ifeq ($(MAKECMDGOALS),alltests)
+     KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+endif
 ifneq (,$(wildcard /proc/config.gz))
      KCPATH := /proc/config.gz
 else

testsuite/Makefile endif · line 99

Quoted 4 lines
testsuite/Makefile +1 -0
@@ -94,3 +96,4 @@ endif
              rm "$$TMP_ERR" "$$TMP_OUT"; \
              sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \
      done
+     @$(RM) $(KENVFN)

My concern is that there are several targets in this one Makefile.

Quoted 1 line

Why not use -u which gives name but does not create the file?

As the manpage says, this is unsafe, as a file with the same name can be created in the meantime.
Another option is to run the mktemp in the target shell, but this will require to escape every single end of line to make it a single shell command, e.g.:

        KENVFN=$$(mktemp /tmp/tc_testkenv.XXXXXX); \
        if [ "$(KCPATH)" = "/proc/config.gz" ]; then \
                gunzip -c $(KCPATH) >$$KENVFN; \
        ...
        done ; \
        $(RM) $$KENVFN
Signature · 2 lines
Matteo Croce
per aspera ad upstream
#3 lore raw
Quoted 54 lines · Matteo Croce
Quoted 36 lines · Stephen Hemminger
Quoted 25 lines · On Tue, 11 Jun 2019 20:03:26 +0200 Matteo Croce <[email protected]> wrote:

Even if not running the testsuite, every build will leave
a stale tc_testkenv.* file in the system temp directory. Conditionally create the temp file only if we're running the testsuite.

---
 testsuite/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
testsuite/Makefile +3 -1
index 7f247bbc..5353244b 100644
@@ -14,7 +14,9 @@ TESTS_DIR := $(dir $(TESTS))
 
 IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*))
 
-KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+ifeq ($(MAKECMDGOALS),alltests)
+     KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+endif
 ifneq (,$(wildcard /proc/config.gz))
      KCPATH := /proc/config.gz
 else

testsuite/Makefile endif · line 99

Quoted 4 lines
testsuite/Makefile +1 -0
@@ -94,3 +96,4 @@ endif
              rm "$$TMP_ERR" "$$TMP_OUT"; \
              sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \
      done
+     @$(RM) $(KENVFN)

My concern is that there are several targets in this one Makefile.

Quoted 1 line

Why not use -u which gives name but does not create the file?

As the manpage says, this is unsafe, as a file with the same name can be created in the meantime.
Another option is to run the mktemp in the target shell, but this will require to escape every single end of line to make it a single shell command, e.g.:

        KENVFN=$$(mktemp /tmp/tc_testkenv.XXXXXX); \
        if [ "$(KCPATH)" = "/proc/config.gz" ]; then \
                gunzip -c $(KCPATH) >$$KENVFN; \
        ...
        done ; \
        $(RM) $$KENVFN
Quoted 3 lines

--
Matteo Croce
per aspera ad upstream

Anyway, looking for "tc" instead of "alltests" is probably better, as it only runs mktemp when at least the tc test is selected, both manually or via make check from topdir, eg.g

ifeq ($(MAKECMDGOALS),tc)

Do you agree?

Signature · 2 lines
Matteo Croce
per aspera ad upstream
#4 lore raw
Quoted 59 lines · On Wed, 12 Jun 2019 19:32:29 +0200 Matteo Croce <[email protected]> wrote:
Quoted 54 lines · Matteo Croce
Quoted 36 lines · Stephen Hemminger
Quoted 25 lines · On Tue, 11 Jun 2019 20:03:26 +0200 Matteo Croce <[email protected]> wrote:

Even if not running the testsuite, every build will leave
a stale tc_testkenv.* file in the system temp directory. Conditionally create the temp file only if we're running the testsuite.

---
 testsuite/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
testsuite/Makefile +3 -1
index 7f247bbc..5353244b 100644
@@ -14,7 +14,9 @@ TESTS_DIR := $(dir $(TESTS))
 
 IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*))
 
-KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+ifeq ($(MAKECMDGOALS),alltests)
+     KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+endif
 ifneq (,$(wildcard /proc/config.gz))
      KCPATH := /proc/config.gz
 else

testsuite/Makefile endif · line 99

Quoted 4 lines
testsuite/Makefile +1 -0
@@ -94,3 +96,4 @@ endif
              rm "$$TMP_ERR" "$$TMP_OUT"; \
              sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \
      done
+     @$(RM) $(KENVFN)  

My concern is that there are several targets in this one Makefile.

Quoted 1 line

Why not use -u which gives name but does not create the file?

As the manpage says, this is unsafe, as a file with the same name can be created in the meantime.
Another option is to run the mktemp in the target shell, but this will require to escape every single end of line to make it a single shell command, e.g.:

        KENVFN=$$(mktemp /tmp/tc_testkenv.XXXXXX); \
        if [ "$(KCPATH)" = "/proc/config.gz" ]; then \
                gunzip -c $(KCPATH) >$$KENVFN; \
        ...
        done ; \
        $(RM) $$KENVFN
Quoted 3 lines

--
Matteo Croce
per aspera ad upstream

Quoted 7 lines

Anyway, looking for "tc" instead of "alltests" is probably better, as it only runs mktemp when at least the tc test is selected, both manually or via make check from topdir, eg.g

ifeq ($(MAKECMDGOALS),tc)

Do you agree?

Why use /tmp at all for this config file?

#5 lore raw
Quoted 67 lines · Stephen Hemminger
Quoted 63 lines · On Wed, 12 Jun 2019 19:32:29 +0200 Matteo Croce <[email protected]> wrote:
Quoted 54 lines · Matteo Croce
Quoted 36 lines · Stephen Hemminger
Quoted 25 lines · On Tue, 11 Jun 2019 20:03:26 +0200 Matteo Croce <[email protected]> wrote:

Even if not running the testsuite, every build will leave
a stale tc_testkenv.* file in the system temp directory. Conditionally create the temp file only if we're running the testsuite.

---
 testsuite/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
testsuite/Makefile +3 -1
index 7f247bbc..5353244b 100644
@@ -14,7 +14,9 @@ TESTS_DIR := $(dir $(TESTS))
 
 IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*))
 
-KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+ifeq ($(MAKECMDGOALS),alltests)
+     KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+endif
 ifneq (,$(wildcard /proc/config.gz))
      KCPATH := /proc/config.gz
 else

testsuite/Makefile endif · line 99

Quoted 4 lines
testsuite/Makefile +1 -0
@@ -94,3 +96,4 @@ endif
              rm "$$TMP_ERR" "$$TMP_OUT"; \
              sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \
      done
+     @$(RM) $(KENVFN)

My concern is that there are several targets in this one Makefile.

Quoted 1 line

Why not use -u which gives name but does not create the file?

As the manpage says, this is unsafe, as a file with the same name can be created in the meantime.
Another option is to run the mktemp in the target shell, but this will require to escape every single end of line to make it a single shell command, e.g.:

        KENVFN=$$(mktemp /tmp/tc_testkenv.XXXXXX); \
        if [ "$(KCPATH)" = "/proc/config.gz" ]; then \
                gunzip -c $(KCPATH) >$$KENVFN; \
        ...
        done ; \
        $(RM) $$KENVFN
Quoted 3 lines

--
Matteo Croce
per aspera ad upstream

Anyway, looking for "tc" instead of "alltests" is probably better, as it only runs mktemp when at least the tc test is selected, both manually or via make check from topdir, eg.g

Quoted 5 lines
Quoted 3 lines

ifeq ($(MAKECMDGOALS),tc)

Do you agree?

Why use /tmp at all for this config file?

To me any path could work, both /tmp or in the current dir, I have no preference.
The important thing is to remove them wherever they are, as clobbering the build dir is bad as messing /tmp.

Anyway, I double checked, and the only target which uses that temporary file is 'alltests' so, if the path is ok, I think that the condition "ifeq ($(MAKECMDGOALS),alltests)" is the only one which fixes the issue and keeps the behaviour unaltered.
I did some quick tests and it works for me.

Bye,

Signature · 2 lines
Matteo Croce
per aspera ad upstream
#6 lore raw
Quoted 87 lines · Matteo Croce
Quoted 67 lines · Stephen Hemminger
Quoted 63 lines · On Wed, 12 Jun 2019 19:32:29 +0200 Matteo Croce <[email protected]> wrote:
Quoted 54 lines · Matteo Croce
Quoted 36 lines · Stephen Hemminger
Quoted 25 lines · On Tue, 11 Jun 2019 20:03:26 +0200 Matteo Croce <[email protected]> wrote:

Even if not running the testsuite, every build will leave
a stale tc_testkenv.* file in the system temp directory. Conditionally create the temp file only if we're running the testsuite.

---
 testsuite/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
testsuite/Makefile +3 -1
index 7f247bbc..5353244b 100644
@@ -14,7 +14,9 @@ TESTS_DIR := $(dir $(TESTS))
 
 IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*))
 
-KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+ifeq ($(MAKECMDGOALS),alltests)
+     KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX)
+endif
 ifneq (,$(wildcard /proc/config.gz))
      KCPATH := /proc/config.gz
 else

testsuite/Makefile endif · line 99

Quoted 4 lines
testsuite/Makefile +1 -0
@@ -94,3 +96,4 @@ endif
              rm "$$TMP_ERR" "$$TMP_OUT"; \
              sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \
      done
+     @$(RM) $(KENVFN)

My concern is that there are several targets in this one Makefile.

Quoted 1 line

Why not use -u which gives name but does not create the file?

As the manpage says, this is unsafe, as a file with the same name can be created in the meantime.
Another option is to run the mktemp in the target shell, but this will require to escape every single end of line to make it a single shell command, e.g.:

        KENVFN=$$(mktemp /tmp/tc_testkenv.XXXXXX); \
        if [ "$(KCPATH)" = "/proc/config.gz" ]; then \
                gunzip -c $(KCPATH) >$$KENVFN; \
        ...
        done ; \
        $(RM) $$KENVFN
Quoted 3 lines

--
Matteo Croce
per aspera ad upstream

Anyway, looking for "tc" instead of "alltests" is probably better, as it only runs mktemp when at least the tc test is selected, both manually or via make check from topdir, eg.g

Quoted 5 lines
Quoted 3 lines

ifeq ($(MAKECMDGOALS),tc)

Do you agree?

Why use /tmp at all for this config file?

To me any path could work, both /tmp or in the current dir, I have no preference.
The important thing is to remove them wherever they are, as clobbering the build dir is bad as messing /tmp.

Anyway, I double checked, and the only target which uses that temporary file is 'alltests' so, if the path is ok, I think that the condition "ifeq ($(MAKECMDGOALS),alltests)" is the only one which fixes the issue and keeps the behaviour unaltered.
I did some quick tests and it works for me.

Quoted 4 lines

Bye,
--
Matteo Croce
per aspera ad upstream

Hi,

any more thoughts about this patch?

Signature · 2 lines
Matteo Croce
per aspera ad upstream
#7 lore raw
Quoted 22 lines · Matteo Croce
Quoted 15 lines · Matteo Croce

On Wed, Jun 12, 2019 at 8:20 PM Stephen Hemminger
<[email protected]> wrote:

To me any path could work, both /tmp or in the current dir, I have no preference.
The important thing is to remove them wherever they are, as clobbering the build dir is bad as messing /tmp.

Anyway, I double checked, and the only target which uses that temporary file is 'alltests' so, if the path is ok, I think that the condition "ifeq ($(MAKECMDGOALS),alltests)" is the only one which fixes the issue and keeps the behaviour unaltered.
I did some quick tests and it works for me.

Quoted 4 lines

Bye,
--
Matteo Croce
per aspera ad upstream

Quoted 7 lines

Hi,

any more thoughts about this patch?

--
Matteo Croce
per aspera ad upstream

Hi,

almost forgot about this one. Should I resend it, or it was nacked?

Regards,

Signature · 2 lines
Matteo Croce
per aspera ad upstream