richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
c2dfb7
From e39c4e6aee6c2ece5d9b51cc0e7a772016546f5a Mon Sep 17 00:00:00 2001
c2dfb7
From: Yu Watanabe <watanabe.yu+github@gmail.com>
c2dfb7
Date: Thu, 13 Sep 2018 03:01:42 +0900
c2dfb7
Subject: [PATCH] test: replace duplicated Makefile by symbolic link
c2dfb7
c2dfb7
(cherry picked from commit dd75c133d81f07c56c82ee4e7a80f391ffebd9ce)
c2dfb7
c2dfb7
Resolves: #1823767
c2dfb7
---
c2dfb7
 test/TEST-17-UDEV-WANTS/Makefile    | 5 +----
c2dfb7
 test/TEST-18-FAILUREACTION/Makefile | 5 +----
c2dfb7
 test/TEST-19-DELEGATE/Makefile      | 5 +----
c2dfb7
 test/TEST-20-MAINPIDGAMES/Makefile  | 5 +----
c2dfb7
 test/TEST-21-SYSUSERS/Makefile      | 5 +----
c2dfb7
 test/TEST-22-TMPFILES/Makefile      | 5 +----
c2dfb7
 test/TEST-23-TYPE-EXEC/Makefile     | 5 +----
c2dfb7
 7 files changed, 7 insertions(+), 28 deletions(-)
c2dfb7
 mode change 100644 => 120000 test/TEST-17-UDEV-WANTS/Makefile
c2dfb7
 mode change 100644 => 120000 test/TEST-18-FAILUREACTION/Makefile
c2dfb7
 mode change 100644 => 120000 test/TEST-19-DELEGATE/Makefile
c2dfb7
 mode change 100644 => 120000 test/TEST-20-MAINPIDGAMES/Makefile
c2dfb7
 mode change 100644 => 120000 test/TEST-21-SYSUSERS/Makefile
c2dfb7
 mode change 100644 => 120000 test/TEST-22-TMPFILES/Makefile
c2dfb7
 mode change 100644 => 120000 test/TEST-23-TYPE-EXEC/Makefile
c2dfb7
c2dfb7
diff --git a/test/TEST-17-UDEV-WANTS/Makefile b/test/TEST-17-UDEV-WANTS/Makefile
c2dfb7
deleted file mode 100644
c2dfb7
index 34d7cc6cdf..0000000000
c2dfb7
--- a/test/TEST-17-UDEV-WANTS/Makefile
c2dfb7
+++ /dev/null
c2dfb7
@@ -1,4 +0,0 @@
c2dfb7
-BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
c2dfb7
-
c2dfb7
-all setup clean run:
c2dfb7
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
c2dfb7
diff --git a/test/TEST-17-UDEV-WANTS/Makefile b/test/TEST-17-UDEV-WANTS/Makefile
c2dfb7
new file mode 120000
c2dfb7
index 0000000000..e9f93b1104
c2dfb7
--- /dev/null
c2dfb7
+++ b/test/TEST-17-UDEV-WANTS/Makefile
c2dfb7
@@ -0,0 +1 @@
c2dfb7
+../TEST-01-BASIC/Makefile
c2dfb7
\ No newline at end of file
c2dfb7
diff --git a/test/TEST-18-FAILUREACTION/Makefile b/test/TEST-18-FAILUREACTION/Makefile
c2dfb7
deleted file mode 100644
c2dfb7
index 34d7cc6cdf..0000000000
c2dfb7
--- a/test/TEST-18-FAILUREACTION/Makefile
c2dfb7
+++ /dev/null
c2dfb7
@@ -1,4 +0,0 @@
c2dfb7
-BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
c2dfb7
-
c2dfb7
-all setup clean run:
c2dfb7
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
c2dfb7
diff --git a/test/TEST-18-FAILUREACTION/Makefile b/test/TEST-18-FAILUREACTION/Makefile
c2dfb7
new file mode 120000
c2dfb7
index 0000000000..e9f93b1104
c2dfb7
--- /dev/null
c2dfb7
+++ b/test/TEST-18-FAILUREACTION/Makefile
c2dfb7
@@ -0,0 +1 @@
c2dfb7
+../TEST-01-BASIC/Makefile
c2dfb7
\ No newline at end of file
c2dfb7
diff --git a/test/TEST-19-DELEGATE/Makefile b/test/TEST-19-DELEGATE/Makefile
c2dfb7
deleted file mode 100644
c2dfb7
index 34d7cc6cdf..0000000000
c2dfb7
--- a/test/TEST-19-DELEGATE/Makefile
c2dfb7
+++ /dev/null
c2dfb7
@@ -1,4 +0,0 @@
c2dfb7
-BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
c2dfb7
-
c2dfb7
-all setup clean run:
c2dfb7
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
c2dfb7
diff --git a/test/TEST-19-DELEGATE/Makefile b/test/TEST-19-DELEGATE/Makefile
c2dfb7
new file mode 120000
c2dfb7
index 0000000000..e9f93b1104
c2dfb7
--- /dev/null
c2dfb7
+++ b/test/TEST-19-DELEGATE/Makefile
c2dfb7
@@ -0,0 +1 @@
c2dfb7
+../TEST-01-BASIC/Makefile
c2dfb7
\ No newline at end of file
c2dfb7
diff --git a/test/TEST-20-MAINPIDGAMES/Makefile b/test/TEST-20-MAINPIDGAMES/Makefile
c2dfb7
deleted file mode 100644
c2dfb7
index 34d7cc6cdf..0000000000
c2dfb7
--- a/test/TEST-20-MAINPIDGAMES/Makefile
c2dfb7
+++ /dev/null
c2dfb7
@@ -1,4 +0,0 @@
c2dfb7
-BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
c2dfb7
-
c2dfb7
-all setup clean run:
c2dfb7
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
c2dfb7
diff --git a/test/TEST-20-MAINPIDGAMES/Makefile b/test/TEST-20-MAINPIDGAMES/Makefile
c2dfb7
new file mode 120000
c2dfb7
index 0000000000..e9f93b1104
c2dfb7
--- /dev/null
c2dfb7
+++ b/test/TEST-20-MAINPIDGAMES/Makefile
c2dfb7
@@ -0,0 +1 @@
c2dfb7
+../TEST-01-BASIC/Makefile
c2dfb7
\ No newline at end of file
c2dfb7
diff --git a/test/TEST-21-SYSUSERS/Makefile b/test/TEST-21-SYSUSERS/Makefile
c2dfb7
deleted file mode 100644
c2dfb7
index 34d7cc6cdf..0000000000
c2dfb7
--- a/test/TEST-21-SYSUSERS/Makefile
c2dfb7
+++ /dev/null
c2dfb7
@@ -1,4 +0,0 @@
c2dfb7
-BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
c2dfb7
-
c2dfb7
-all setup clean run:
c2dfb7
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
c2dfb7
diff --git a/test/TEST-21-SYSUSERS/Makefile b/test/TEST-21-SYSUSERS/Makefile
c2dfb7
new file mode 120000
c2dfb7
index 0000000000..e9f93b1104
c2dfb7
--- /dev/null
c2dfb7
+++ b/test/TEST-21-SYSUSERS/Makefile
c2dfb7
@@ -0,0 +1 @@
c2dfb7
+../TEST-01-BASIC/Makefile
c2dfb7
\ No newline at end of file
c2dfb7
diff --git a/test/TEST-22-TMPFILES/Makefile b/test/TEST-22-TMPFILES/Makefile
c2dfb7
deleted file mode 100644
c2dfb7
index 34d7cc6cdf..0000000000
c2dfb7
--- a/test/TEST-22-TMPFILES/Makefile
c2dfb7
+++ /dev/null
c2dfb7
@@ -1,4 +0,0 @@
c2dfb7
-BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
c2dfb7
-
c2dfb7
-all setup clean run:
c2dfb7
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
c2dfb7
diff --git a/test/TEST-22-TMPFILES/Makefile b/test/TEST-22-TMPFILES/Makefile
c2dfb7
new file mode 120000
c2dfb7
index 0000000000..e9f93b1104
c2dfb7
--- /dev/null
c2dfb7
+++ b/test/TEST-22-TMPFILES/Makefile
c2dfb7
@@ -0,0 +1 @@
c2dfb7
+../TEST-01-BASIC/Makefile
c2dfb7
\ No newline at end of file
c2dfb7
diff --git a/test/TEST-23-TYPE-EXEC/Makefile b/test/TEST-23-TYPE-EXEC/Makefile
c2dfb7
deleted file mode 100644
c2dfb7
index 34d7cc6cdf..0000000000
c2dfb7
--- a/test/TEST-23-TYPE-EXEC/Makefile
c2dfb7
+++ /dev/null
c2dfb7
@@ -1,4 +0,0 @@
c2dfb7
-BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
c2dfb7
-
c2dfb7
-all setup clean run:
c2dfb7
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
c2dfb7
diff --git a/test/TEST-23-TYPE-EXEC/Makefile b/test/TEST-23-TYPE-EXEC/Makefile
c2dfb7
new file mode 120000
c2dfb7
index 0000000000..e9f93b1104
c2dfb7
--- /dev/null
c2dfb7
+++ b/test/TEST-23-TYPE-EXEC/Makefile
c2dfb7
@@ -0,0 +1 @@
c2dfb7
+../TEST-01-BASIC/Makefile
c2dfb7
\ No newline at end of file