You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/02/16 02:13:03 UTC
svn commit: r1244814 - in /incubator/mesos/trunk: bin/gdb-mesos-local.sh.in
bin/gdb-mesos-master.sh.in bin/gdb-mesos-slave.sh.in
bin/gdb-mesos-tests.sh.in configure.ac
Author: benh
Date: Thu Feb 16 01:13:02 2012
New Revision: 1244814
URL: http://svn.apache.org/viewvc?rev=1244814&view=rev
Log:
Change bin/gdb-* scripts to use generated libtool and added bin/gdb-mesos-test.sh.in.
Added:
incubator/mesos/trunk/bin/gdb-mesos-tests.sh.in
- copied, changed from r1244810, incubator/mesos/trunk/bin/gdb-mesos-local.sh.in
Modified:
incubator/mesos/trunk/bin/gdb-mesos-local.sh.in
incubator/mesos/trunk/bin/gdb-mesos-master.sh.in
incubator/mesos/trunk/bin/gdb-mesos-slave.sh.in
incubator/mesos/trunk/configure.ac
Modified: incubator/mesos/trunk/bin/gdb-mesos-local.sh.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/gdb-mesos-local.sh.in?rev=1244814&r1=1244813&r2=1244814&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/gdb-mesos-local.sh.in (original)
+++ incubator/mesos/trunk/bin/gdb-mesos-local.sh.in Thu Feb 16 01:13:02 2012
@@ -16,29 +16,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# This is a wrapper for running gdb on the mesos-master before it is
+# This is a wrapper for running gdb on the mesos-local before it is
# installed that first sets up environment variables as appropriate.
# Use colors for errors.
. @abs_top_srcdir@/support/colors.sh
-OS=`uname`
+LIBTOOL=@abs_top_builddir@/libtool
-if test "${OS}" == "Darwin"; then
- LIBTOOL=glibtool
-else
- LIBTOOL=libtool
-fi
+test ! -e ${LIBTOOL} && \
+ echo "${RED}Failed to find ${LIBTOOL}, have you run configure?${NORMAL}" && \
+ exit 1
# Confirm libtool has "gdb" support.
${LIBTOOL} --mode=execute gdb -batch >/dev/null 2>&1
-if test $? != 0; then
- echo "${RED}Failed to find a valid libtool that supports gdb${NORMAL}"
- test "${OS}" == "Darwin" && \
- echo "This appears to be OS X, try installing Xcode to get 'glibtool'"
+test $? != 0 && \
+ echo "${RED}Generated libtool doesn't appear to support gdb${NORMAL}" && \
exit 1
-fi
. @abs_top_builddir@/bin/mesos-build-env.sh
Modified: incubator/mesos/trunk/bin/gdb-mesos-master.sh.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/gdb-mesos-master.sh.in?rev=1244814&r1=1244813&r2=1244814&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/gdb-mesos-master.sh.in (original)
+++ incubator/mesos/trunk/bin/gdb-mesos-master.sh.in Thu Feb 16 01:13:02 2012
@@ -22,23 +22,18 @@
# Use colors for errors.
. @abs_top_srcdir@/support/colors.sh
-OS=`uname`
+LIBTOOL=@abs_top_builddir@/libtool
-if test "${OS}" == "Darwin"; then
- LIBTOOL=glibtool
-else
- LIBTOOL=libtool
-fi
+test ! -e ${LIBTOOL} && \
+ echo "${RED}Failed to find ${LIBTOOL}, have you run configure?${NORMAL}" && \
+ exit 1
# Confirm libtool has "gdb" support.
${LIBTOOL} --mode=execute gdb -batch >/dev/null 2>&1
-if test $? != 0; then
- echo "${RED}Failed to find a valid libtool that supports gdb${NORMAL}"
- test "${OS}" == "Darwin" && \
- echo "This appears to be OS X, try installing Xcode to get 'glibtool'"
+test $? != 0 && \
+ echo "${RED}Generated libtool doesn't appear to support gdb${NORMAL}" && \
exit 1
-fi
. @abs_top_builddir@/bin/mesos-build-env.sh
Modified: incubator/mesos/trunk/bin/gdb-mesos-slave.sh.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/gdb-mesos-slave.sh.in?rev=1244814&r1=1244813&r2=1244814&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/gdb-mesos-slave.sh.in (original)
+++ incubator/mesos/trunk/bin/gdb-mesos-slave.sh.in Thu Feb 16 01:13:02 2012
@@ -22,23 +22,18 @@
# Use colors for errors.
. @abs_top_srcdir@/support/colors.sh
-OS=`uname`
+LIBTOOL=@abs_top_builddir@/libtool
-if test "${OS}" == "Darwin"; then
- LIBTOOL=glibtool
-else
- LIBTOOL=libtool
-fi
+test ! -e ${LIBTOOL} && \
+ echo "${RED}Failed to find ${LIBTOOL}, have you run configure?${NORMAL}" && \
+ exit 1
# Confirm libtool has "gdb" support.
${LIBTOOL} --mode=execute gdb -batch >/dev/null 2>&1
-if test $? != 0; then
- echo "${RED}Failed to find a valid libtool that supports gdb${NORMAL}"
- test "${OS}" == "Darwin" && \
- echo "This appears to be OS X, try installing Xcode to get 'glibtool'"
+test $? != 0 && \
+ echo "${RED}Generated libtool doesn't appear to support gdb${NORMAL}" && \
exit 1
-fi
. @abs_top_builddir@/bin/mesos-build-env.sh
Copied: incubator/mesos/trunk/bin/gdb-mesos-tests.sh.in (from r1244810, incubator/mesos/trunk/bin/gdb-mesos-local.sh.in)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/gdb-mesos-tests.sh.in?p2=incubator/mesos/trunk/bin/gdb-mesos-tests.sh.in&p1=incubator/mesos/trunk/bin/gdb-mesos-local.sh.in&r1=1244810&r2=1244814&rev=1244814&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/gdb-mesos-local.sh.in (original)
+++ incubator/mesos/trunk/bin/gdb-mesos-tests.sh.in Thu Feb 16 01:13:02 2012
@@ -22,25 +22,20 @@
# Use colors for errors.
. @abs_top_srcdir@/support/colors.sh
-OS=`uname`
+LIBTOOL=@abs_top_builddir@/libtool
-if test "${OS}" == "Darwin"; then
- LIBTOOL=glibtool
-else
- LIBTOOL=libtool
-fi
+test ! -e ${LIBTOOL} && \
+ echo "${RED}Failed to find ${LIBTOOL}, have you run configure?${NORMAL}" && \
+ exit 1
# Confirm libtool has "gdb" support.
${LIBTOOL} --mode=execute gdb -batch >/dev/null 2>&1
-if test $? != 0; then
- echo "${RED}Failed to find a valid libtool that supports gdb${NORMAL}"
- test "${OS}" == "Darwin" && \
- echo "This appears to be OS X, try installing Xcode to get 'glibtool'"
+test $? != 0 && \
+ echo "${RED}Generated libtool doesn't appear to support gdb${NORMAL}" && \
exit 1
-fi
. @abs_top_builddir@/bin/mesos-build-env.sh
exec ${LIBTOOL} --mode=execute gdb --args \
- @abs_top_builddir@/src/mesos-local "${@}"
+ @abs_top_builddir@/src/mesos-tests "${@}"
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1244814&r1=1244813&r2=1244814&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Thu Feb 16 01:13:02 2012
@@ -76,12 +76,14 @@ AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([third_party/Makefile])
AC_CONFIG_FILES([bin/mesos-build-env.sh])
+AC_CONFIG_FILES([bin/mesos-local.sh], [chmod +x bin/mesos-local.sh])
AC_CONFIG_FILES([bin/mesos-master.sh], [chmod +x bin/mesos-master.sh])
AC_CONFIG_FILES([bin/mesos-slave.sh], [chmod +x bin/mesos-slave.sh])
-AC_CONFIG_FILES([bin/mesos-local.sh], [chmod +x bin/mesos-local.sh])
+AC_CONFIG_FILES([bin/mesos-tests.sh], [chmod +x bin/mesos-tests.sh])
+AC_CONFIG_FILES([bin/gdb-mesos-local.sh], [chmod +x bin/gdb-mesos-local.sh])
AC_CONFIG_FILES([bin/gdb-mesos-master.sh], [chmod +x bin/gdb-mesos-master.sh])
AC_CONFIG_FILES([bin/gdb-mesos-slave.sh], [chmod +x bin/gdb-mesos-slave.sh])
-AC_CONFIG_FILES([bin/gdb-mesos-local.sh], [chmod +x bin/gdb-mesos-local.sh])
+AC_CONFIG_FILES([bin/gdb-mesos-tests.sh], [chmod +x bin/gdb-mesos-tests.sh])
AC_ARG_ENABLE([java],
AS_HELP_STRING([--disable-java],