ldd01: remove all -m32/-m64 logic

and build all binaries with same CFLAGS as rest of LTP build.
Also treat lddfile*.so and lddfile.out as data files.

Signed-off-by: Jan Stancek <jstancek@redhat.com>
Acked-by: Cyril Hrubis <chrubis@suse.cz>

9 files changed, 57 insertions, 61 deletions

diff --git a/testcases/commands/ade/ldd/Makefile b/testcases/commands/ade/ldd/Makefile
index eae06cd7d..f37f21b2e 100644
--- a/testcases/commands/ade/ldd/Makefile
+++ b/testcases/commands/ade/ldd/Makefile
@@ -13,10 +13,6 @@
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
 # Garrett Cooper, July 2009
 #
 
@@ -24,13 +20,6 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
 
-CPPFLAGS		+= -fpic
-
 INSTALL_TARGETS		:= ldd01
 
-MAKE_TARGETS		:= $(patsubst $(abs_srcdir)/%.c,%.obj,$(wildcard $(abs_srcdir)/*.c))
-
-$(MAKE_TARGETS): %.obj: %.o
-	mv $^ $@
-
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/commands/ade/ldd/datafiles/Makefile b/testcases/commands/ade/ldd/datafiles/Makefile
new file mode 100644
index 000000000..3d91d2831
--- /dev/null
+++ b/testcases/commands/ade/ldd/datafiles/Makefile
@@ -0,0 +1,37 @@
+#
+#    commands/ade/ldd/datafiles testcases Makefile.
+#
+#    Copyright (C) 2014, Linux Test Project.
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+
+top_srcdir		?= ../../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+CPPFLAGS		+= -fpic
+
+INSTALL_TARGETS		:= ldd*.so lddfile.out
+
+LDD_C_FILES		:= $(wildcard $(abs_srcdir)/lddfile*.c)
+LDD_SO_FILES		:= $(patsubst $(abs_srcdir)/%.c,%.obj.so,$(LDD_C_FILES))
+MAKE_TARGETS		:= lddfile.out
+CLEAN_TARGETS		+= *.obj $(LDD_SO_FILES)
+
+%.obj.so: %.o
+	$(CC) $(CFLAGS) -shared -o $@ $^
+
+lddfile.out: main.o $(LDD_SO_FILES)
+	$(CC) $(CFLAGS) -O -o $@ $?
+
+INSTALL_DIR		:= testcases/data/ldd01
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/commands/ade/ldd/lddfile1.c b/testcases/commands/ade/ldd/datafiles/lddfile1.c
index 377f7a3a2..ccb5786a9 100644
--- a/testcases/commands/ade/ldd/lddfile1.c
+++ b/testcases/commands/ade/ldd/datafiles/lddfile1.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-void file1()
+void file1(void)
 {
 	printf("Control in function %s\n", __func__);
 }
diff --git a/testcases/commands/ade/ldd/lddfile2.c b/testcases/commands/ade/ldd/datafiles/lddfile2.c
index 5fd2b4b64..20aede313 100644
--- a/testcases/commands/ade/ldd/lddfile2.c
+++ b/testcases/commands/ade/ldd/datafiles/lddfile2.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-void file2()
+void file2(void)
 {
 	printf("Control in function %s\n", __func__);
 }
diff --git a/testcases/commands/ade/ldd/lddfile3.c b/testcases/commands/ade/ldd/datafiles/lddfile3.c
index d6b4cc9f3..a4529f7ac 100644
--- a/testcases/commands/ade/ldd/lddfile3.c
+++ b/testcases/commands/ade/ldd/datafiles/lddfile3.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-void file3()
+void file3(void)
 {
 	printf("Control in function %s\n", __func__);
 }
diff --git a/testcases/commands/ade/ldd/lddfile4.c b/testcases/commands/ade/ldd/datafiles/lddfile4.c
index 1db89bbe6..9dc339df4 100644
--- a/testcases/commands/ade/ldd/lddfile4.c
+++ b/testcases/commands/ade/ldd/datafiles/lddfile4.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-void file4()
+void file4(void)
 {
 	printf("Control in function %s\n", __func__);
 }
diff --git a/testcases/commands/ade/ldd/lddfile5.c b/testcases/commands/ade/ldd/datafiles/lddfile5.c
index 2f46cdb28..3fbb7f607 100644
--- a/testcases/commands/ade/ldd/lddfile5.c
+++ b/testcases/commands/ade/ldd/datafiles/lddfile5.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-void file5()
+void file5(void)
 {
 	printf("Control in function %s\n", __func__);
 }
diff --git a/testcases/commands/ade/ldd/main.c b/testcases/commands/ade/ldd/datafiles/main.c
index 0f23b8b30..69e278e86 100644
--- a/testcases/commands/ade/ldd/main.c
+++ b/testcases/commands/ade/ldd/datafiles/main.c
@@ -1,12 +1,12 @@
 #include <stdio.h>
 
-void file1();
-void file2();
-void file3();
-void file4();
-void file5();
+void file1(void);
+void file2(void);
+void file3(void);
+void file4(void);
+void file5(void);
 
-int main()
+int main(void)
 {
 	file1();
 	file2();
diff --git a/testcases/commands/ade/ldd/ldd01 b/testcases/commands/ade/ldd/ldd01
index c60d3ac1c..c0e4d0779 100755
--- a/testcases/commands/ade/ldd/ldd01
+++ b/testcases/commands/ade/ldd/ldd01
@@ -32,67 +32,37 @@
 #trace_logic=${trace_logic:-"set -x"}
 $trace_logic
 
-CC=${CC:=gcc}
 LDD=${LDD:=ldd}
-TCdat=${TCdat:-`pwd`}
-TCtmp=${TCtmp:-/tmp/ldd01-$$}
+TCID=ldd01
+TST_TOTAL=1
 
-do_cleanup()
-{
-	rm -rf $TCtmp
-}
+. test.sh
 
-do_setup()
+do_test()
 {
-	mkdir $TCtmp
 
-	# Check for ppc64 architecture or x86_64 architecture
-	if uname -a | grep -iq powerpc; then
-		file lddfile1.obj | grep 64-bit >/dev/null 2>&1
-		if [ $? -eq 0 ]; then
-			CFLAGS="-m64"
-		fi
-	elif uname -a | grep -iq x86_64; then
-		file lddfile1.obj | grep 32-bit >/dev/null 2>&1
-		if [ $? -eq 0 ]; then
-			CFLAGS="-m32"
-		fi
-	fi
-	$CC $CFLAGS -shared -o $TCtmp/lddfile1.obj.so $TCdat/lddfile1.obj
-	$CC $CFLAGS -shared -o $TCtmp/lddfile2.obj.so $TCdat/lddfile2.obj
-	$CC $CFLAGS -shared -o $TCtmp/lddfile3.obj.so $TCdat/lddfile3.obj
-	$CC $CFLAGS -shared -o $TCtmp/lddfile4.obj.so $TCdat/lddfile4.obj
-	$CC $CFLAGS -shared -o $TCtmp/lddfile5.obj.so $TCdat/lddfile5.obj
-	$CC $CFLAGS -O -o $TCtmp/a.out $TCtmp/lddfile*.obj.so $TCdat/main.obj
-}
+	export LD_LIBRARY_PATH="$LTP_DATAROOT:$LD_LIBRARY_PATH"
+	LDDTESTFILE="$LTP_DATAROOT/lddfile.out"
 
-do_test()
-{
 	echo "  ASSERTION 1  "
-
-	$LDD $TCtmp/a.out | grep -E "lddfile1.obj.so|lddfile2.obj.so|lddfile3.obj.so|lddfile4.obj.so|lddfile5.obj.so"
+	$LDD $LDDTESTFILE | grep -E "lddfile1.obj.so|lddfile2.obj.so|lddfile3.obj.so|lddfile4.obj.so|lddfile5.obj.so"
 	if [ $? -eq 0 ]; then
 		echo "ASSERTION #1 PASS"
 	else
 		echo "ASSERTION #1 FAIL"
-		do_cleanup
 		return 1
 	fi
 
 	echo " ASSERTION 2  "
-
-	$LDD -v $TCtmp/a.out | grep -E "GLIBC|lddfile1.obj.so|lddfile2.obj.so|lddfile3.obj.so|lddfile4.obj.so|lddfile5.obj.so"
+	$LDD -v $LDDTESTFILE | grep -E "GLIBC|lddfile1.obj.so|lddfile2.obj.so|lddfile3.obj.so|lddfile4.obj.so|lddfile5.obj.so"
 	if [ $? -eq 0 ]; then
 		echo "ASSERTION #2 PASS"
 	else
 		echo "ASSERTION #2 FAIL"
-		do_cleanup
 		return 1
 	fi
 
 	echo "TEST PASSES"
-	do_cleanup
 	return 0
 }
-do_setup
 do_test