Changeset 3112


Ignore:
Timestamp:
Nov 10, 2013, 6:02:19 AM (8 years ago)
Author:
Peter
Message:

In tests issue configure with --disable-shared/--disable-static if yat build was configure with shared/static disabled

Location:
trunk/test
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/defs.sh.in

    r3110 r3112  
    125125abs_top_builddir=@abs_top_builddir@
    126126abs_top_srcdir=@abs_top_srcdir@
     127enable_static="@enable_static@"
     128enable_shared="@enable_shared@"
    127129lt_cv_objdir=@lt_cv_objdir@
    128130have_doxygen="@have_doxygen@"
     
    130132verbose="--verbose"
    131133silent=
     134configure_opts=
     135test x"$enable_shared" = x"no" && configure_opts="--disable-shared"
     136test x"$enable_static" = x"no" \
     137&& configure_opts="$onfigure_options --disable-static"
    132138
    133139GSL_CONFIG=@GSL_CONFIG@
     140YAT_CONFIG=$abs_top_builddir/build_support/yat-config
    134141
    135142# user is always right
  • trunk/test/static_test.sh

    r3111 r3112  
    4444
    4545bootstrap
    46 ./configure --with-yat=$abs_top_builddir/build_support/yat-config
     46./configure $configure_opts --with-yat=$YAT_CONFIG
    4747
    4848make
  • trunk/test/yat_cpp_add_flag_test.sh

    r3036 r3112  
    4343
    4444bootstrap
    45 ./configure CXX=g++
     45./configure $configure_opts CXX=g++
    4646
    4747grep 'YAT_CPPFLAGS__' Makefile || exit_fail
  • trunk/test/yat_cxx_add_flag_test.sh

    r3036 r3112  
    4141
    4242bootstrap
    43 ./configure CXX=g++
     43./configure $configure_opts CXX=g++
    4444
    4545grep 'YAT_CXXFLAGS__' Makefile
  • trunk/test/yat_have_svn_wc_test.sh

    r3036 r3112  
    4242
    4343bootstrap
    44 ./configure
     44./configure $configure_opts
    4545grep 'all-local' Makefile
    4646make
  • trunk/test/yat_ld_add_flag_test.sh

    r3036 r3112  
    4343
    4444bootstrap
    45 ./configure CXX=g++
     45./configure $configure_opts CXX=g++
    4646
    4747grep 'YAT_LDFLAGS__' Makefile || exit_fail
  • trunk/test/yat_lt_compile_ifelse_test.sh

    r3069 r3112  
    4949# bootstrapping
    5050bootstrap
    51 ./configure || exit_fail
     51./configure $configure_opts || exit_fail
    5252exit_success
  • trunk/test/yat_lt_link_ifelse_test.sh

    r3036 r3112  
    6868# bootstrapping
    6969bootstrap
    70 if ./configure --with-yat=$abs_top_builddir/build_support/yat-config; then
     70if ./configure $configure_opts --with-yat=$YAT_CONFIG; then
    7171    echo OK;
    7272else
  • trunk/test/yat_lt_link_la_ifelse_test.sh

    r3110 r3112  
    7070
    7171bootstrap
    72 if ./configure; then
     72if ./configure $configure_opts; then
    7373    echo OK;
    7474else
  • trunk/test/yat_m4_test.sh

    r3036 r3112  
    4444
    4545bootstrap
    46 ./configure -C --with-yat=$abs_top_builddir/build_support/yat-config
     46./configure $configure_opts -C --with-yat=$YAT_CONFIG
    4747
    4848make
    4949./hello || exit_fail
    5050
    51 ./configure -C --with-yat=$abs_top_builddir/build_support/yat-config > stdout
     51./configure $configure_opts -C --with-yat=$YAT_CONFIG > stdout
    5252cat stdout
    5353grep yat stdout
  • trunk/test/yat_m4_test2.sh

    r3036 r3112  
    4343
    4444bootstrap
    45 ./configure --without-yat
     45./configure $configure_opts --without-yat
    4646make Makefile
    4747
  • trunk/test/yat_m4_with_bam_test.sh

    r3108 r3112  
    3939bootstrap
    4040grep '^YAT_CHECK_LIB_WITH_BAM' configure && exit_fail
    41 if ./configure --with-yat=$abs_top_builddir/build_support/yat-config; then :;
     41if ./configure $configure_opts --with-yat=$YAT_CONFIG; then :;
    4242else
    4343warn_ configure failed unexpectedly
  • trunk/test/yat_msg_error_test.sh

    r3036 r3112  
    4545bootstrap
    4646rm -f config.status
    47 run ./configure 1
     47run ./configure 1 $configure_opts
    4848grep "$specific_msg" stderr || exit_fail
    4949grep "$specific_msg" config.log || exit_fail
  • trunk/test/yat_msg_error_test2.sh

    r3036 r3112  
    4040bootstrap
    4141rm -f config.status
    42 run ./configure 0
     42run ./configure 0 $configure_opts
    4343
    4444exit_success
  • trunk/test/yat_pc_test.sh

    r3107 r3112  
    5858CXXFLAGS = `pkg-config yat --cflags-only-other`
    5959# add -L to link to local libyat
    60 LDFLAGS = -L$abs_top_builddir/yat/.libs `pkg-config yat --libs --static`
     60LDFLAGS = -L$abs_top_builddir/yat/${lt_cv_objdir} `pkg-config yat --libs --static`
    6161all: prog
    6262
  • trunk/test/yat_prog_move_if_change_test.sh

    r3036 r3112  
    4141test -r move-if-change || exit_fail "move-if-change not generated by autoconf"
    4242grep MOVE_IF_CHANGE Makefile.in || exit_fail
    43 ./configure
     43./configure $configure_opts
    4444grep "MOVE_IF_CHANGE.*move-if-change" Makefile || exit_fail
    4545exit_success;
  • trunk/test/yat_revision_header_test.sh

    r3036 r3112  
    6363grep '\.revision' my.am && exit_fail
    6464
    65 ./configure || exit_fail
     65./configure $configure_opts || exit_fail
    6666make check VERBOSE=1 || exit_fail
    6767
  • trunk/test/yat_svn_release_year_test.sh

    r3036 r3112  
    5050grep release_year.txt my.am || exit_fail
    5151
    52 ./configure
     52./configure $configure_opts
    5353grep RELEASE_YEAR config.h || exit_fail
    5454make
     
    7373cat stdout
    7474test -s stderr && exit_fail
    75 ./configure
     75./configure $configure_opts
    7676make
    7777
  • trunk/test/yat_svn_revision_test.sh

    r3036 r3112  
    4747test -r my_revision || exit_fail
    4848
    49 ./configure
     49./configure $configure_opts
    5050make
    5151exit_success;
Note: See TracChangeset for help on using the changeset viewer.