Module Name: src
Committed By: riz
Date: Tue Mar 8 17:17:54 UTC 2011
Modified Files:
src/dist/atf/tests/atf/tools [netbsd-5]: t_atf_config.sh
src/lib/libatf-c [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by jmmv in ticket #1563):
dist/atf/tests/atf/tools/t_atf_config.sh patch
lib/libatf-c/Makefile patch
Fix the values of atf_arch and atf_machine: the former is supposed to be
the cpu name and the latter the port name. They had been reversed until
now due to some "smart" stupidity^Wlogic in the upstream configure script,
which is now gone.
This is a pullup of revision f9329ca68da7e8557e0803b5747a12f8c10b1258
plus the corresponding reachover build changes.
Addresses PR bin/44305.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \
src/dist/atf/tests/atf/tools/t_atf_config.sh
cvs rdiff -u -r1.2 -r1.2.4.1 src/lib/libatf-c/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/atf/tests/atf/tools/t_atf_config.sh
diff -u src/dist/atf/tests/atf/tools/t_atf_config.sh:1.1.1.3 src/dist/atf/tests/atf/tools/t_atf_config.sh:1.1.1.3.6.1
--- src/dist/atf/tests/atf/tools/t_atf_config.sh:1.1.1.3 Thu May 1 15:22:33 2008
+++ src/dist/atf/tests/atf/tools/t_atf_config.sh Tue Mar 8 17:17:54 2011
@@ -150,36 +150,6 @@
done
}
-# XXX: This does not seem to belong here...
-atf_test_case arch
-arch_head()
-{
- atf_set "descr" "Tests that the current value of atf_arch is correct" \
- "for the corresponding atf_machine"
-}
-arch_body()
-{
- atf_check "atf-config -t atf_arch" 0 stdout null
- arch=$(cat stdout)
- atf_check "atf-config -t atf_machine" 0 stdout null
- machine=$(cat stdout)
- echo "Machine type ${machine}, architecture ${arch}"
-
- case ${machine} in
- i386|i486|i586|i686)
- exp_arch=i386
- ;;
- x86_64)
- exp_arch=amd64
- ;;
- *)
- exp_arch=${machine}
- esac
- echo "Expected architecture ${exp_arch}"
-
- atf_check_equal ${arch} ${exp_arch}
-}
-
atf_init_test_cases()
{
atf_add_test_case list_all
@@ -191,8 +161,6 @@
atf_add_test_case query_mixture
atf_add_test_case override_env
-
- atf_add_test_case arch
}
# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
Index: src/lib/libatf-c/Makefile
diff -u src/lib/libatf-c/Makefile:1.2 src/lib/libatf-c/Makefile:1.2.4.1
--- src/lib/libatf-c/Makefile:1.2 Sun Jul 20 14:36:52 2008
+++ src/lib/libatf-c/Makefile Tue Mar 8 17:17:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/07/20 14:36:52 veego Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2011/03/08 17:17:54 riz Exp $
NOLINT= # defined
@@ -15,10 +15,10 @@
CPPFLAGS+= -I.
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -DATF_ARCH=\"${MACHINE}\"
+CPPFLAGS+= -DATF_ARCH=\"${MACHINE_ARCH}\"
CPPFLAGS+= -DATF_CONFDIR=\"/etc/atf\"
CPPFLAGS+= -DATF_LIBEXECDIR=\"/usr/libexec\"
-CPPFLAGS+= -DATF_MACHINE=\"${MACHINE_ARCH}\"
+CPPFLAGS+= -DATF_MACHINE=\"${MACHINE}\"
CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\"
CPPFLAGS+= -DATF_SHELL=\"/bin/sh\"
CPPFLAGS+= -DATF_WORKDIR=\"/tmp\"
