daandemeyer / rpms / systemd

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