diff options
author | Björn Gustavsson <[email protected]> | 2016-02-18 15:55:37 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2016-02-18 15:55:37 +0100 |
commit | 24f0d567ceffb0f1555bc3032b7801ba377e5a3b (patch) | |
tree | 7ddc913ec28740fb152babae474b42cb5d554b11 /.gitignore | |
parent | 6b9b39aca9a25a328f1dc4553120f7c8f26b5648 (diff) | |
parent | dcda9b507bf14391c8bed91bfa9c56355342b681 (diff) | |
download | otp-24f0d567ceffb0f1555bc3032b7801ba377e5a3b.tar.gz otp-24f0d567ceffb0f1555bc3032b7801ba377e5a3b.tar.bz2 otp-24f0d567ceffb0f1555bc3032b7801ba377e5a3b.zip |
Merge branch 'bjorn/remove-test_server/OTP-12705'
* bjorn/remove-test_server/OTP-12705:
Remove test_server as a standalone application
Erlang mode for Emacs: Include ct.hrl instead test_server.hrl
Remove out-commented references to the test_server applications
Makefiles: Remove test_server from include path and code path
Eliminate use of test_server.hrl and test_server_line.hrl
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index e27b5b12ff..3dcfa79f4d 100644 --- a/.gitignore +++ b/.gitignore @@ -182,7 +182,6 @@ JAVADOC-GENERATED # Files generated by configure. # -/lib/*/configure /lib/*/config.log /lib/*/config.status @@ -190,6 +189,8 @@ JAVADOC-GENERATED # Files generated by "./otp_build autoconf" # +/lib/*/configure +/lib/common_test/test_server/configure /lib/configure.in /aclocal.m4 /lib/common_test/priv/auxdir/config.guess @@ -201,9 +202,9 @@ JAVADOC-GENERATED /lib/erl_interface/src/auxdir/install-sh /lib/megaco/aclocal.m4 /lib/odbc/aclocal.m4 -/lib/test_server/src/config.guess -/lib/test_server/src/config.sub -/lib/test_server/src/install-sh +/lib/common_test/test_server/config.guess +/lib/common_test/test_server/config.sub +/lib/common_test/test_server/install-sh /lib/wx/aclocal.m4 /lib/wx/autoconf/config.guess /lib/wx/autoconf/config.sub |