Changeset 56de5932


Ignore:
Timestamp:
Jul 25, 2018, 5:18:10 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
4e1572f
Parents:
b8f6002
Message:

configure now creates a symlink in the test folder when building outside of the tree

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • configure

    rb8f6002 r56de5932  
    62656265
    62666266
     6267ac_config_links="$ac_config_links src/tests/test.py:src/tests/test.py"
     6268
     6269
    62676270ac_config_files="$ac_config_files src/tests/config.py"
    62686271
     
    68486851config_files="$ac_config_files"
    68496852config_headers="$ac_config_headers"
     6853config_links="$ac_config_links"
    68506854config_commands="$ac_config_commands"
    68516855
     
    68776881Configuration headers:
    68786882$config_headers
     6883
     6884Configuration links:
     6885$config_links
    68796886
    68806887Configuration commands:
     
    70297036    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
    70307037    "tools/prettyprinter/Makefile") CONFIG_FILES="$CONFIG_FILES tools/prettyprinter/Makefile" ;;
     7038    "src/tests/test.py") CONFIG_LINKS="$CONFIG_LINKS src/tests/test.py:src/tests/test.py" ;;
    70317039    "src/tests/config.py") CONFIG_FILES="$CONFIG_FILES src/tests/config.py" ;;
    70327040
     
    70437051  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
    70447052  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
     7053  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
    70457054  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
    70467055fi
     
    73407349
    73417350
    7342 eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
     7351eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS  :L $CONFIG_LINKS  :C $CONFIG_COMMANDS"
    73437352shift
    73447353for ac_tag
     
    76177626          s/.*/./; q'`/stamp-h$_am_stamp_count
    76187627 ;;
    7619 
     7628  :L)
     7629  #
     7630  # CONFIG_LINK
     7631  #
     7632
     7633  if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
     7634    :
     7635  else
     7636    # Prefer the file from the source tree if names are identical.
     7637    if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
     7638      ac_source=$srcdir/$ac_source
     7639    fi
     7640
     7641    { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
     7642$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
     7643
     7644    if test ! -r "$ac_source"; then
     7645      as_fn_error $? "$ac_source: file not found" "$LINENO" 5
     7646    fi
     7647    rm -f "$ac_file"
     7648
     7649    # Try a relative symlink, then a hard link, then a copy.
     7650    case $ac_source in
     7651    [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
     7652        *) ac_rel_source=$ac_top_build_prefix$ac_source ;;
     7653    esac
     7654    ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
     7655      ln "$ac_source" "$ac_file" 2>/dev/null ||
     7656      cp -p "$ac_source" "$ac_file" ||
     7657      as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
     7658  fi
     7659 ;;
    76207660  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
    76217661$as_echo "$as_me: executing $ac_file commands" >&6;}
  • configure.ac

    rb8f6002 r56de5932  
    250250        ])
    251251
     252AC_CONFIG_LINKS([src/tests/test.py:src/tests/test.py])
     253
    252254AC_OUTPUT(src/tests/config.py)
    253255
  • src/tests/Makefile.in

    rb8f6002 r56de5932  
    104104CONFIG_HEADER = $(top_builddir)/config.h
    105105CONFIG_CLEAN_FILES = config.py
    106 CONFIG_CLEAN_VPATH_FILES =
     106CONFIG_CLEAN_VPATH_FILES = test.py
    107107am__dirstamp = $(am__leading_dot)dirstamp
    108108am_avl_test_OBJECTS = avltree/avl_test.$(OBJEXT) \
     
    170170CTAGS = ctags
    171171am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.py.in \
    172         $(top_srcdir)/automake/depcomp
     172        $(srcdir)/test.py $(top_srcdir)/automake/depcomp
    173173DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    174174ACLOCAL = @ACLOCAL@
  • src/tests/pybin/tools.py

    rb8f6002 r56de5932  
    163163
    164164        # Start the walk
    165         abspath = os.path.abspath(__main__.__file__)
    166         dname = os.path.dirname(abspath)
     165        dname = settings.SRCDIR
    167166        os.path.walk(dname, step, '')
    168167
Note: See TracChangeset for help on using the changeset viewer.