patches/gcc/0008-libvtv-test-fix.patch

   1 From 51e98cbe7c3b71e2b351254b6f82eb6b7bdfb7d1 Mon Sep 17 00:00:00 2001
   2 From: Szabolcs Nagy <nsz@port70.net>
   3 Date: Sat, 20 Aug 2016 21:20:29 +0000
   4 Subject: [PATCH 8/8] libvtv-test-fix
   5
   6 ---
   7  libvtv/configure                            |  3 +++
   8  libvtv/configure.ac                         |  1 +
   9  libvtv/testsuite/Makefile.am                |  2 ++
  10  libvtv/testsuite/Makefile.in                | 33 +++++++++++++++++------------
  11  libvtv/testsuite/lib/libvtv.exp             |  5 +++++
  12  libvtv/testsuite/libvtv-test-support.exp.in |  1 +
  13  6 files changed, 31 insertions(+), 14 deletions(-)
  14  create mode 100644 libvtv/testsuite/libvtv-test-support.exp.in
  15
  16 diff --git a/libvtv/configure b/libvtv/configure
  17 index ea1a17f..93e4d8e 100755
  18 --- a/libvtv/configure
  19 +++ b/libvtv/configure
  20 @@ -15465,6 +15465,8 @@ ac_config_files="$ac_config_files Makefile"
  21  if test "x$VTV_SUPPORTED" = "xyes"; then
  22    ac_config_files="$ac_config_files testsuite/Makefile"
  23
  24 +  ac_config_files="$ac_config_files testsuite/libvtv-test-support.exp"
  25 +
  26  fi
  27
  28  case "$target_os" in
  29 @@ -16628,6 +16630,7 @@ do
  30      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
  31      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
  32      "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
  33 +    "testsuite/libvtv-test-support.exp") CONFIG_FILES="$CONFIG_FILES testsuite/libvtv-test-support.exp" ;;
  34
  35    *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  36    esac
  37 diff --git a/libvtv/configure.ac b/libvtv/configure.ac
  38 index 19c6508..31ce1ba 100644
  39 --- a/libvtv/configure.ac
  40 +++ b/libvtv/configure.ac
  41 @@ -174,6 +174,7 @@ _EOF
  42      . ${multi_basedir}/config-ml.in
  43      AS_UNSET([ml_norecursion])
  44  ])
  45 +  AC_CONFIG_FILES(testsuite/libvtv-test-support.exp)
  46  fi
  47
  48  case "$target_os" in
  49 diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am
  50 index 561b7e2..6c5e5fc 100644
  51 --- a/libvtv/testsuite/Makefile.am
  52 +++ b/libvtv/testsuite/Makefile.am
  53 @@ -11,3 +11,5 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
  54  _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
  55              echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
  56  RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS)"
  57 +
  58 +all-local: libatomic-test-support.exp
  59 diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in
  60 index e19e13e..60754ce 100644
  61 --- a/libvtv/testsuite/Makefile.in
  62 +++ b/libvtv/testsuite/Makefile.in
  63 @@ -52,7 +52,8 @@ build_triplet = @build@
  64  host_triplet = @host@
  65  target_triplet = @target@
  66  subdir = testsuite
  67 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
  68 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
  69 +       $(srcdir)/libvtv-test-support.exp.in
  70  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  71  am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
  72         $(top_srcdir)/../config/depstand.m4 \
  73 @@ -68,7 +69,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
  74  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  75         $(ACLOCAL_M4)
  76  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
  77 -CONFIG_CLEAN_FILES =
  78 +CONFIG_CLEAN_FILES = libvtv-test-support.exp
  79  CONFIG_CLEAN_VPATH_FILES =
  80  SOURCES =
  81  am__can_run_installinfo = \
  82 @@ -260,6 +261,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
  83  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  84         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  85  $(am__aclocal_m4_deps):
  86 +libvtv-test-support.exp: $(top_builddir)/config.status $(srcdir)/libvtv-test-support.exp.in
  87 +       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  88
  89  mostlyclean-libtool:
  90         -rm -f *.lo
  91 @@ -320,7 +323,7 @@ distclean-DEJAGNU:
  92  check-am: all-am
  93         $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
  94  check: check-am
  95 -all-am: Makefile
  96 +all-am: Makefile all-local
  97  installdirs:
  98  install: install-am
  99  install-exec: install-exec-am
 100 @@ -420,19 +423,21 @@ uninstall-am:
 101
 102  .MAKE: check-am install-am install-strip
 103
 104 -.PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \
 105 -       clean-libtool distclean distclean-DEJAGNU distclean-generic \
 106 -       distclean-libtool dvi dvi-am html html-am info info-am install \
 107 -       install-am install-data install-data-am install-dvi \
 108 -       install-dvi-am install-exec install-exec-am install-html \
 109 -       install-html-am install-info install-info-am install-man \
 110 -       install-pdf install-pdf-am install-ps install-ps-am \
 111 -       install-strip installcheck installcheck-am installdirs \
 112 -       maintainer-clean maintainer-clean-generic mostlyclean \
 113 -       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 114 -       uninstall uninstall-am
 115 +.PHONY: all all-am all-local check check-DEJAGNU check-am clean \
 116 +       clean-generic clean-libtool distclean distclean-DEJAGNU \
 117 +       distclean-generic distclean-libtool dvi dvi-am html html-am \
 118 +       info info-am install install-am install-data install-data-am \
 119 +       install-dvi install-dvi-am install-exec install-exec-am \
 120 +       install-html install-html-am install-info install-info-am \
 121 +       install-man install-pdf install-pdf-am install-ps \
 122 +       install-ps-am install-strip installcheck installcheck-am \
 123 +       installdirs maintainer-clean maintainer-clean-generic \
 124 +       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 125 +       ps ps-am uninstall uninstall-am
 126
 127
 128 +all-local: libatomic-test-support.exp
 129 +
 130  # Tell versions [3.59,3.63) of GNU make to not export all variables.
 131  # Otherwise a system limit (for SysV at least) may be exceeded.
 132  .NOEXPORT:
 133 diff --git a/libvtv/testsuite/lib/libvtv.exp b/libvtv/testsuite/lib/libvtv.exp
 134 index edf5fdd..70e2d0e 100644
 135 --- a/libvtv/testsuite/lib/libvtv.exp
 136 +++ b/libvtv/testsuite/lib/libvtv.exp
 137 @@ -47,6 +47,8 @@ load_gcc_lib timeout-dg.exp
 138  load_gcc_lib torture-options.exp
 139  load_gcc_lib fortran-modules.exp
 140
 141 +load_file libvtv-test-support.exp
 142 +
 143  set dg-do-what-default run
 144
 145  #
 146 @@ -74,6 +76,7 @@ proc libvtv_init { args } {
 147      global ALWAYS_CFLAGS
 148      global CFLAGS
 149      global TOOL_EXECUTABLE TOOL_OPTIONS
 150 +    global BUILD_CC
 151      global GCC_UNDER_TEST
 152      global TESTING_IN_BUILD_TREE
 153      global target_triplet
 154 @@ -89,6 +92,8 @@ proc libvtv_init { args } {
 155      if ![info exists GCC_UNDER_TEST] then {
 156         if [info exists TOOL_EXECUTABLE] {
 157             set GCC_UNDER_TEST $TOOL_EXECUTABLE
 158 +       } elseif [info exists BUILD_CC] {
 159 +           set GCC_UNDER_TEST $BUILD_CC
 160         } else {
 161             set GCC_UNDER_TEST "[find_gcc]"
 162         }
 163 diff --git a/libvtv/testsuite/libvtv-test-support.exp.in b/libvtv/testsuite/libvtv-test-support.exp.in
 164 new file mode 100644
 165 index 0000000..972f8d5
 166 --- /dev/null
 167 +++ b/libvtv/testsuite/libvtv-test-support.exp.in
 168 @@ -0,0 +1 @@
 169 +set BUILD_CC "@CC@"
 170 --
 171 2.8.1
 172