From fff5f989a59858ea75c856277ebe9464ab5d4e00 Mon Sep 17 00:00:00 2001
From: Alessandro Di Federico <ale@rev.ng>
Date: Wed, 9 Nov 2022 14:37:39 +0100
Subject: [PATCH] tests: adopt `temp`

---
 share/revng/test/configuration/revng/revng.yml | 10 ++++------
 .../revng/test/configuration/revng/yields.yml  | 18 ++++++------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/share/revng/test/configuration/revng/revng.yml b/share/revng/test/configuration/revng/revng.yml
index 78d47bbd9..339fbc3ef 100644
--- a/share/revng/test/configuration/revng/revng.yml
+++ b/share/revng/test/configuration/revng/revng.yml
@@ -64,19 +64,17 @@ commands:
       - type: revng-qa.compiled
         filter: example-executable-1
     command: |-
-      TMP="$$(mktemp --tmpdir tmp.revng.test-daemon.XXXXXXXXXX)";
-      trap 'rm -f -- "$$TMP"' EXIT;
+      TMP="$$(temp)";
       if ! python3 -m pytest "${SOURCES_ROOT}/tests/daemon/test.py" --binary "$INPUT" >& "$$TMP"; then
-      cat "$$TMP";
-      exit 1;
+        cat "$$TMP";
+        exit 1;
       fi;
   - type: revng.test-daemon-self-test
     from:
       - type: revng-qa.compiled
         filter: example-executable-1
     command: |-
-      TMP="$$(mktemp --tmpdir tmp.revng.test-daemon-self-test.XXXXXXXXXX)";
-      trap 'rm -f -- "$$TMP"' EXIT;
+      TMP="$$(temp)";
       if ! revng daemon-self-test "$INPUT" >& "$$TMP"; then
         cat "$$TMP";
         exit 1;
diff --git a/share/revng/test/configuration/revng/yields.yml b/share/revng/test/configuration/revng/yields.yml
index 7714f5bfe..7b21a6026 100644
--- a/share/revng/test/configuration/revng/yields.yml
+++ b/share/revng/test/configuration/revng/yields.yml
@@ -11,8 +11,7 @@ commands:
         filter: one-per-architecture
     suffix: .yml.yml
     command: |-
-      MODEL="$$(mktemp --tmpdir tmp.revng.assembly-internal.XXXXXXXXXX)";
-      trap 'rm -f -- "$$MODEL"' EXIT;
+      MODEL="$$(temp)";
       revng model dump "$INPUT2" > "$$MODEL";
       revng pipeline
         -m "$$MODEL"
@@ -29,8 +28,7 @@ commands:
         filter: one-per-architecture
     suffix: .ptml.yml
     command: |-
-      MODEL="$$(mktemp --tmpdir tmp.revng.assembly-ptml.XXXXXXXXXX)";
-      trap 'rm -f -- "$$MODEL"' EXIT;
+      MODEL="$$(temp)";
       revng model dump "$INPUT2" > "$$MODEL";
       revng pipeline
         -m "$$MODEL"
@@ -46,8 +44,7 @@ commands:
         filter: one-per-architecture
     suffix: .svg.yml
     command: |-
-      MODEL="$$(mktemp --tmpdir tmp.revng.cfg-svg.XXXXXXXXXX)";
-      trap 'rm -f -- "$$MODEL"' EXIT;
+      MODEL="$$(temp)";
       revng model dump "$INPUT2" > "$$MODEL";
       revng pipeline
         -m "$$MODEL"
@@ -63,8 +60,7 @@ commands:
         filter: one-per-architecture
     suffix: .yml
     command: |-
-      MODEL="$$(mktemp --tmpdir tmp.revng.cross-relations.XXXXXXXXXX)";
-      trap 'rm -f -- "$$MODEL"' EXIT;
+      MODEL="$$(temp)";
       revng model dump "$INPUT2" > "$$MODEL";
       revng pipeline
         -m "$$MODEL"
@@ -81,8 +77,7 @@ commands:
         filter: one-per-architecture
     suffix: .svg.yml
     command: |-
-      MODEL="$$(mktemp --tmpdir tmp.revng.call-graph-svg.XXXXXXXXXX)";
-      trap 'rm -f -- "$$MODEL"' EXIT;
+      MODEL="$$(temp)";
       revng model dump "$INPUT2" > "$$MODEL";
       revng pipeline
         -m "$$MODEL"
@@ -100,8 +95,7 @@ commands:
         filter: one-per-architecture
     suffix: .svg.yml
     command: |-
-      MODEL="$$(mktemp --tmpdir tmp.revng.call-graph-slice-svg.XXXXXXXXXX)";
-      trap 'rm -f -- "$$MODEL"' EXIT;
+      MODEL="$$(temp)";
       revng model dump "$INPUT2" > "$$MODEL";
       revng pipeline
         -m "$$MODEL"