clean up initfirst regress conflict created by my import. split tests

into two sub dirs.

42 files changed, 83 insertions, 18 deletions

diff --git a/regress/libexec/ld.so/initfirst/Makefile b/regress/libexec/ld.so/initfirst/Makefile
index b878c98153d..e5150f529aa 100644
--- a/regress/libexec/ld.so/initfirst/Makefile
+++ b/regress/libexec/ld.so/initfirst/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.1 2011/11/08 23:51:02 guenther Exp $
+# $OpenBSD: Makefile,v 1.2 2011/11/29 04:36:15 kurt Exp $
 
-SUBDIR+= libif1 libif2 libif3 libnormal prog1
+SUBDIR+= test1 test2
 
 .include <bsd.subdir.mk>
diff --git a/regress/libexec/ld.so/initfirst/test1/Makefile b/regress/libexec/ld.so/initfirst/test1/Makefile
new file mode 100644
index 00000000000..ef6f83b4e36
--- /dev/null
+++ b/regress/libexec/ld.so/initfirst/test1/Makefile
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $
+
+SUBDIR+= libif1 libif2 libif3 libnormal prog1
+
+.include <bsd.subdir.mk>
diff --git a/regress/libexec/ld.so/initfirst/Makefile.inc b/regress/libexec/ld.so/initfirst/test1/Makefile.inc
index e5716a74c99..9eae9a1d154 100644
--- a/regress/libexec/ld.so/initfirst/Makefile.inc
+++ b/regress/libexec/ld.so/initfirst/test1/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.1 2011/11/08 23:51:02 guenther Exp $
+# $OpenBSD: Makefile.inc,v 1.1 2011/11/29 04:36:15 kurt Exp $
 
 .include <bsd.obj.mk>
 
diff --git a/regress/libexec/ld.so/initfirst/lib.c b/regress/libexec/ld.so/initfirst/test1/lib.c
index 6087b1dd996..3285b9f8fad 100644
--- a/regress/libexec/ld.so/initfirst/lib.c
+++ b/regress/libexec/ld.so/initfirst/test1/lib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lib.c,v 1.1 2011/11/08 23:51:02 guenther Exp $	*/
+/*	$OpenBSD: lib.c,v 1.1 2011/11/29 04:36:15 kurt Exp $	*/
 
 /*
  * Copyright (c) 2011 Philip Guenther <guenther@openbsd.org>
diff --git a/regress/libexec/ld.so/initfirst/libif1/Makefile b/regress/libexec/ld.so/initfirst/test1/libif1/Makefile
index 3b8484ca731..df751d1b19c 100644
--- a/regress/libexec/ld.so/initfirst/libif1/Makefile
+++ b/regress/libexec/ld.so/initfirst/test1/libif1/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2011/11/08 23:51:02 guenther Exp $
+#	$OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $
 
 LIB=		if1
 SRCS=		lib.c
diff --git a/regress/libexec/ld.so/initfirst/libif1/lib.c b/regress/libexec/ld.so/initfirst/test1/libif1/lib.c
index 1708c5a9ec3..1708c5a9ec3 100644
--- a/regress/libexec/ld.so/initfirst/libif1/lib.c
+++ b/regress/libexec/ld.so/initfirst/test1/libif1/lib.c
diff --git a/regress/libexec/ld.so/initfirst/libif1/shlib_version b/regress/libexec/ld.so/initfirst/test1/libif1/shlib_version
index 987ef746955..987ef746955 100644
--- a/regress/libexec/ld.so/initfirst/libif1/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test1/libif1/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/libif2/Makefile b/regress/libexec/ld.so/initfirst/test1/libif2/Makefile
index 3741eeea7b1..e2b942ef6db 100644
--- a/regress/libexec/ld.so/initfirst/libif2/Makefile
+++ b/regress/libexec/ld.so/initfirst/test1/libif2/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2011/11/08 23:51:02 guenther Exp $
+#	$OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $
 
 LIB=		if2
 SRCS=		lib.c
diff --git a/regress/libexec/ld.so/initfirst/libif2/lib.c b/regress/libexec/ld.so/initfirst/test1/libif2/lib.c
index 656cd1146f6..656cd1146f6 100644
--- a/regress/libexec/ld.so/initfirst/libif2/lib.c
+++ b/regress/libexec/ld.so/initfirst/test1/libif2/lib.c
diff --git a/regress/libexec/ld.so/initfirst/libif2/shlib_version b/regress/libexec/ld.so/initfirst/test1/libif2/shlib_version
index 987ef746955..987ef746955 100644
--- a/regress/libexec/ld.so/initfirst/libif2/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test1/libif2/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/libif3/Makefile b/regress/libexec/ld.so/initfirst/test1/libif3/Makefile
index da806319f8d..d8947d197b4 100644
--- a/regress/libexec/ld.so/initfirst/libif3/Makefile
+++ b/regress/libexec/ld.so/initfirst/test1/libif3/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2011/11/08 23:51:02 guenther Exp $
+#	$OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $
 
 LIB=		if3
 SRCS=		lib.c
diff --git a/regress/libexec/ld.so/initfirst/libif3/lib.c b/regress/libexec/ld.so/initfirst/test1/libif3/lib.c
index 52ea7474274..52ea7474274 100644
--- a/regress/libexec/ld.so/initfirst/libif3/lib.c
+++ b/regress/libexec/ld.so/initfirst/test1/libif3/lib.c
diff --git a/regress/libexec/ld.so/initfirst/libif3/shlib_version b/regress/libexec/ld.so/initfirst/test1/libif3/shlib_version
index 987ef746955..987ef746955 100644
--- a/regress/libexec/ld.so/initfirst/libif3/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test1/libif3/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/libnormal/Makefile b/regress/libexec/ld.so/initfirst/test1/libnormal/Makefile
index 20b1b5ef1fa..bb0c5d0a3ab 100644
--- a/regress/libexec/ld.so/initfirst/libnormal/Makefile
+++ b/regress/libexec/ld.so/initfirst/test1/libnormal/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2011/11/08 23:51:02 guenther Exp $
+#	$OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $
 
 LIB=		normal
 SRCS=		lib.c
diff --git a/regress/libexec/ld.so/initfirst/libnormal/lib.c b/regress/libexec/ld.so/initfirst/test1/libnormal/lib.c
index 4018c0338ce..4018c0338ce 100644
--- a/regress/libexec/ld.so/initfirst/libnormal/lib.c
+++ b/regress/libexec/ld.so/initfirst/test1/libnormal/lib.c
diff --git a/regress/libexec/ld.so/initfirst/libnormal/shlib_version b/regress/libexec/ld.so/initfirst/test1/libnormal/shlib_version
index 987ef746955..987ef746955 100644
--- a/regress/libexec/ld.so/initfirst/libnormal/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test1/libnormal/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/prog1/Makefile b/regress/libexec/ld.so/initfirst/test1/prog1/Makefile
index 06387f568ab..aa720f9dff9 100644
--- a/regress/libexec/ld.so/initfirst/prog1/Makefile
+++ b/regress/libexec/ld.so/initfirst/test1/prog1/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2011/11/29 04:06:42 guenther Exp $
+# $OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $
 
 PROGS=		prog1 prog2 prog3 prog4
 SRCS=		main.c
diff --git a/regress/libexec/ld.so/initfirst/prog1/expected1 b/regress/libexec/ld.so/initfirst/test1/prog1/expected1
index c0c333dab40..c0c333dab40 100644
--- a/regress/libexec/ld.so/initfirst/prog1/expected1
+++ b/regress/libexec/ld.so/initfirst/test1/prog1/expected1
diff --git a/regress/libexec/ld.so/initfirst/prog1/expected2 b/regress/libexec/ld.so/initfirst/test1/prog1/expected2
index 88a77519df0..88a77519df0 100644
--- a/regress/libexec/ld.so/initfirst/prog1/expected2
+++ b/regress/libexec/ld.so/initfirst/test1/prog1/expected2
diff --git a/regress/libexec/ld.so/initfirst/prog1/expected3 b/regress/libexec/ld.so/initfirst/test1/prog1/expected3
index 88a77519df0..88a77519df0 100644
--- a/regress/libexec/ld.so/initfirst/prog1/expected3
+++ b/regress/libexec/ld.so/initfirst/test1/prog1/expected3
diff --git a/regress/libexec/ld.so/initfirst/prog1/expected4 b/regress/libexec/ld.so/initfirst/test1/prog1/expected4
index 7b3cd500010..7b3cd500010 100644
--- a/regress/libexec/ld.so/initfirst/prog1/expected4
+++ b/regress/libexec/ld.so/initfirst/test1/prog1/expected4
diff --git a/regress/libexec/ld.so/initfirst/prog1/main.c b/regress/libexec/ld.so/initfirst/test1/prog1/main.c
index 65f0c20adf9..f420dbfad56 100644
--- a/regress/libexec/ld.so/initfirst/prog1/main.c
+++ b/regress/libexec/ld.so/initfirst/test1/prog1/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.1 2011/11/08 23:51:02 guenther Exp $	*/
+/*	$OpenBSD: main.c,v 1.1 2011/11/29 04:36:15 kurt Exp $	*/
 
 /*
  * Copyright (c) 2011 Philip Guenther <guenther@openbsd.org>
diff --git a/regress/libexec/ld.so/initfirst/test2/Makefile b/regress/libexec/ld.so/initfirst/test2/Makefile
new file mode 100644
index 00000000000..1052e99b6fe
--- /dev/null
+++ b/regress/libexec/ld.so/initfirst/test2/Makefile
@@ -0,0 +1,3 @@
+SUBDIR=libae libad libac libab libaa prog1 prog2
+
+.include <bsd.subdir.mk>
diff --git a/regress/libexec/ld.so/initfirst/libaa/Makefile b/regress/libexec/ld.so/initfirst/test2/libaa/Makefile
index 65d3c85fb78..65d3c85fb78 100644
--- a/regress/libexec/ld.so/initfirst/libaa/Makefile
+++ b/regress/libexec/ld.so/initfirst/test2/libaa/Makefile
diff --git a/regress/libexec/ld.so/initfirst/libaa/aa.C b/regress/libexec/ld.so/initfirst/test2/libaa/aa.C
index 6c024da662d..609af5c1ea0 100644
--- a/regress/libexec/ld.so/initfirst/libaa/aa.C
+++ b/regress/libexec/ld.so/initfirst/test2/libaa/aa.C
@@ -1,7 +1,7 @@
 /*
  * Public Domain 2011 Kurt Miller
  *
- * $OpenBSD: aa.C,v 1.1 2011/11/29 03:38:26 kurt Exp $
+ * $OpenBSD: aa.C,v 1.1 2011/11/29 04:36:15 kurt Exp $
  */
 
 #include <iostream>
diff --git a/regress/libexec/ld.so/initfirst/libaa/shlib_version b/regress/libexec/ld.so/initfirst/test2/libaa/shlib_version
index 97c9f92d6b8..97c9f92d6b8 100644
--- a/regress/libexec/ld.so/initfirst/libaa/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test2/libaa/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/libab/Makefile b/regress/libexec/ld.so/initfirst/test2/libab/Makefile
index 0e9b84d741e..0e9b84d741e 100644
--- a/regress/libexec/ld.so/initfirst/libab/Makefile
+++ b/regress/libexec/ld.so/initfirst/test2/libab/Makefile
diff --git a/regress/libexec/ld.so/initfirst/libab/ab.C b/regress/libexec/ld.so/initfirst/test2/libab/ab.C
index f1b18927efb..1812c3ca617 100644
--- a/regress/libexec/ld.so/initfirst/libab/ab.C
+++ b/regress/libexec/ld.so/initfirst/test2/libab/ab.C
@@ -1,7 +1,7 @@
 /*
  * Public Domain 2011 Kurt Miller
  *
- * $OpenBSD: ab.C,v 1.1 2011/11/29 03:38:26 kurt Exp $
+ * $OpenBSD: ab.C,v 1.1 2011/11/29 04:36:15 kurt Exp $
  */
 
 #include <iostream>
diff --git a/regress/libexec/ld.so/initfirst/libab/shlib_version b/regress/libexec/ld.so/initfirst/test2/libab/shlib_version
index 97c9f92d6b8..97c9f92d6b8 100644
--- a/regress/libexec/ld.so/initfirst/libab/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test2/libab/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/libac/Makefile b/regress/libexec/ld.so/initfirst/test2/libac/Makefile
index 299b4649e15..299b4649e15 100644
--- a/regress/libexec/ld.so/initfirst/libac/Makefile
+++ b/regress/libexec/ld.so/initfirst/test2/libac/Makefile
diff --git a/regress/libexec/ld.so/initfirst/libac/ac.C b/regress/libexec/ld.so/initfirst/test2/libac/ac.C
index 15844f9ca18..512ef496b40 100644
--- a/regress/libexec/ld.so/initfirst/libac/ac.C
+++ b/regress/libexec/ld.so/initfirst/test2/libac/ac.C
@@ -1,7 +1,7 @@
 /*
  * Public Domain 2011 Kurt Miller
  *
- * $OpenBSD: ac.C,v 1.1 2011/11/29 03:38:26 kurt Exp $
+ * $OpenBSD: ac.C,v 1.1 2011/11/29 04:36:15 kurt Exp $
  */
 
 #include <iostream>
diff --git a/regress/libexec/ld.so/initfirst/libac/shlib_version b/regress/libexec/ld.so/initfirst/test2/libac/shlib_version
index 97c9f92d6b8..97c9f92d6b8 100644
--- a/regress/libexec/ld.so/initfirst/libac/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test2/libac/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/libad/Makefile b/regress/libexec/ld.so/initfirst/test2/libad/Makefile
index 73cf97acd50..73cf97acd50 100644
--- a/regress/libexec/ld.so/initfirst/libad/Makefile
+++ b/regress/libexec/ld.so/initfirst/test2/libad/Makefile
diff --git a/regress/libexec/ld.so/initfirst/libad/ad.C b/regress/libexec/ld.so/initfirst/test2/libad/ad.C
index e7f5bf34874..1ec19127898 100644
--- a/regress/libexec/ld.so/initfirst/libad/ad.C
+++ b/regress/libexec/ld.so/initfirst/test2/libad/ad.C
@@ -1,7 +1,7 @@
 /*
  * Public Domain 2011 Kurt Miller
  *
- * $OpenBSD: ad.C,v 1.1 2011/11/29 03:38:26 kurt Exp $
+ * $OpenBSD: ad.C,v 1.1 2011/11/29 04:36:15 kurt Exp $
  */
 
 #include <iostream>
diff --git a/regress/libexec/ld.so/initfirst/libad/shlib_version b/regress/libexec/ld.so/initfirst/test2/libad/shlib_version
index 97c9f92d6b8..97c9f92d6b8 100644
--- a/regress/libexec/ld.so/initfirst/libad/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test2/libad/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/libae/Makefile b/regress/libexec/ld.so/initfirst/test2/libae/Makefile
index 50845bbe774..50845bbe774 100644
--- a/regress/libexec/ld.so/initfirst/libae/Makefile
+++ b/regress/libexec/ld.so/initfirst/test2/libae/Makefile
diff --git a/regress/libexec/ld.so/initfirst/libae/ae.C b/regress/libexec/ld.so/initfirst/test2/libae/ae.C
index 824e4f76a76..61f2cdcf472 100644
--- a/regress/libexec/ld.so/initfirst/libae/ae.C
+++ b/regress/libexec/ld.so/initfirst/test2/libae/ae.C
@@ -1,7 +1,7 @@
 /*
  * Public Domain 2011 Kurt Miller
  *
- * $OpenBSD: ae.C,v 1.1 2011/11/29 03:38:26 kurt Exp $
+ * $OpenBSD: ae.C,v 1.1 2011/11/29 04:36:15 kurt Exp $
  */
 
 #include <iostream>
diff --git a/regress/libexec/ld.so/initfirst/libae/shlib_version b/regress/libexec/ld.so/initfirst/test2/libae/shlib_version
index 97c9f92d6b8..97c9f92d6b8 100644
--- a/regress/libexec/ld.so/initfirst/libae/shlib_version
+++ b/regress/libexec/ld.so/initfirst/test2/libae/shlib_version
diff --git a/regress/libexec/ld.so/initfirst/test2/prog1/Makefile b/regress/libexec/ld.so/initfirst/test2/prog1/Makefile
new file mode 100644
index 00000000000..b3d6fcb2b3e
--- /dev/null
+++ b/regress/libexec/ld.so/initfirst/test2/prog1/Makefile
@@ -0,0 +1,57 @@
+# $OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $
+
+.include <bsd.obj.mk>
+
+PROG=prog1
+
+SRCS=prog1.C
+
+AA_DIR=${.CURDIR}/../libaa
+AA_OBJDIR!=    if [ -d $(AA_DIR)/${__objdir} ]; then \
+                        echo "$(AA_DIR)/${__objdir}"; \
+		else \
+			echo "$(AA_DIR)"; \
+		fi
+
+AB_DIR=${.CURDIR}/../libab
+AB_OBJDIR!=    if [ -d $(AB_DIR)/${__objdir} ]; then \
+                        echo "$(AB_DIR)/${__objdir}"; \
+		else \
+			echo "$(AB_DIR)"; \
+		fi
+
+AC_DIR=${.CURDIR}/../libac
+AC_OBJDIR!=    if [ -d $(AC_DIR)/${__objdir} ]; then \
+                        echo "$(AC_DIR)/${__objdir}"; \
+		else \
+			echo "$(AC_DIR)"; \
+		fi
+
+AD_DIR=${.CURDIR}/../libad
+AD_OBJDIR!=    if [ -d $(AD_DIR)/${__objdir} ]; then \
+                        echo "$(AD_DIR)/${__objdir}"; \
+		else \
+			echo "$(AD_DIR)"; \
+		fi
+
+AE_DIR=${.CURDIR}/../libae
+AE_OBJDIR!=    if [ -d $(AE_DIR)/${__objdir} ]; then \
+                        echo "$(AE_DIR)/${__objdir}"; \
+		else \
+			echo "$(AE_DIR)"; \
+		fi
+
+LDADD=-laa
+LDFLAGS=  -L$(AA_OBJDIR)
+LDFLAGS+= -Wl,-rpath,$(AA_OBJDIR) 
+LDFLAGS+= -Wl,-rpath,$(AB_OBJDIR) 
+LDFLAGS+= -Wl,-rpath,$(AC_OBJDIR) 
+LDFLAGS+= -Wl,-rpath,$(AD_OBJDIR) 
+LDFLAGS+= -Wl,-rpath,$(AE_OBJDIR) 
+NOMAN=
+CC=c++
+
+run-regress-${PROG}: ${PROG}
+	[ "`./${PROG}`" = "DBECAPpacebd" ]
+
+.include <bsd.regress.mk>
diff --git a/regress/libexec/ld.so/initfirst/prog1/prog1.C b/regress/libexec/ld.so/initfirst/test2/prog1/prog1.C
index 0eb201d98e8..7a210ef83c4 100644
--- a/regress/libexec/ld.so/initfirst/prog1/prog1.C
+++ b/regress/libexec/ld.so/initfirst/test2/prog1/prog1.C
@@ -1,7 +1,7 @@
 /*
  * Public Domain 2011 Kurt Miller
  *
- * $OpenBSD: prog1.C,v 1.1 2011/11/29 03:38:26 kurt Exp $
+ * $OpenBSD: prog1.C,v 1.1 2011/11/29 04:36:15 kurt Exp $
  */
 
 #include <iostream>
diff --git a/regress/libexec/ld.so/initfirst/prog2/Makefile b/regress/libexec/ld.so/initfirst/test2/prog2/Makefile
index f18f6e7711d..c0c39151d66 100644
--- a/regress/libexec/ld.so/initfirst/prog2/Makefile
+++ b/regress/libexec/ld.so/initfirst/test2/prog2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2011/11/29 03:38:26 kurt Exp $
+# $OpenBSD: Makefile,v 1.1 2011/11/29 04:36:15 kurt Exp $
 
 .include <bsd.obj.mk>
 
diff --git a/regress/libexec/ld.so/initfirst/prog2/prog2.C b/regress/libexec/ld.so/initfirst/test2/prog2/prog2.C
index 5c85d031c0e..87bcbb2798f 100644
--- a/regress/libexec/ld.so/initfirst/prog2/prog2.C
+++ b/regress/libexec/ld.so/initfirst/test2/prog2/prog2.C
@@ -1,7 +1,7 @@
 /*
  * Public Domain 2011 Kurt Miller
  *
- * $OpenBSD: prog2.C,v 1.1 2011/11/29 03:38:26 kurt Exp $
+ * $OpenBSD: prog2.C,v 1.1 2011/11/29 04:36:15 kurt Exp $
  */
 
 #include <iostream>