daandemeyer / rpms / systemd

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