aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/test/erl2html2_SUITE_data
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-02-16 06:45:27 +0100
committerBjörn Gustavsson <[email protected]>2016-02-17 10:35:22 +0100
commitdcda9b507bf14391c8bed91bfa9c56355342b681 (patch)
tree45658baf8d18d7f363a3044972201b957acaffb1 /lib/test_server/test/erl2html2_SUITE_data
parent40aaa8bfa8ec0776a4d70079cf34a5bd337d42fe (diff)
downloadotp-dcda9b507bf14391c8bed91bfa9c56355342b681.tar.gz
otp-dcda9b507bf14391c8bed91bfa9c56355342b681.tar.bz2
otp-dcda9b507bf14391c8bed91bfa9c56355342b681.zip
Remove test_server as a standalone application
The test_server application has previously been deprecated. In OTP 19, we will move relevant parts of test_server into the common_test application. Test suites that include test_server.hrl must be updated to include ct.hrl instead. Test suites that include test_server_line.hrl must removed that inclusion. Test suites that call the test_server module directly will continue to work in OTP 19. The test suites for Erlang/OTP are built and executed in exactly the same way as previously. Here are some more details. The modules test_server*.erl and erl2html2.erl in lib/test_server/src have been moved to common_test/src. The test_server.hrl and test_server_line.hrl include files have been deleted. The macros in test_server.hrl have been copied into lib/common_test/include/ct.hrl. The ts*.erl modules and their associated data files in lib/test_server/src has been been moved to the new directory lib/common_test/test_server. The ts* modules are no longer built to lib/common_test/ebin. They will only built when 'make release_tests' is executed. The test suite for test_server has been moved to lib/common_test/test. The rest of the files have been deleted.
Diffstat (limited to 'lib/test_server/test/erl2html2_SUITE_data')
-rw-r--r--lib/test_server/test/erl2html2_SUITE_data/Makefile.src2
-rw-r--r--lib/test_server/test/erl2html2_SUITE_data/header1.hrl4
-rw-r--r--lib/test_server/test/erl2html2_SUITE_data/include/header2.hrl0
-rw-r--r--lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl1
-rw-r--r--lib/test_server/test/erl2html2_SUITE_data/m1.erl52
5 files changed, 0 insertions, 59 deletions
diff --git a/lib/test_server/test/erl2html2_SUITE_data/Makefile.src b/lib/test_server/test/erl2html2_SUITE_data/Makefile.src
deleted file mode 100644
index 942ac0584b..0000000000
--- a/lib/test_server/test/erl2html2_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,2 +0,0 @@
-all:
- erlc -Iinclude m1.erl \ No newline at end of file
diff --git a/lib/test_server/test/erl2html2_SUITE_data/header1.hrl b/lib/test_server/test/erl2html2_SUITE_data/header1.hrl
deleted file mode 100644
index 53d1b79ac5..0000000000
--- a/lib/test_server/test/erl2html2_SUITE_data/header1.hrl
+++ /dev/null
@@ -1,4 +0,0 @@
-baz() ->
- ok.
-
--define(MACRO_DEFINING_A_FUNCTION,quux() -> ok).
diff --git a/lib/test_server/test/erl2html2_SUITE_data/include/header2.hrl b/lib/test_server/test/erl2html2_SUITE_data/include/header2.hrl
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/test_server/test/erl2html2_SUITE_data/include/header2.hrl
+++ /dev/null
diff --git a/lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl b/lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl
deleted file mode 100644
index 2a20850a3a..0000000000
--- a/lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl
+++ /dev/null
@@ -1 +0,0 @@
--define(EPP_SWITCH, on).
diff --git a/lib/test_server/test/erl2html2_SUITE_data/m1.erl b/lib/test_server/test/erl2html2_SUITE_data/m1.erl
deleted file mode 100644
index 1d405963a5..0000000000
--- a/lib/test_server/test/erl2html2_SUITE_data/m1.erl
+++ /dev/null
@@ -1,52 +0,0 @@
-%% Comment with <html> code &amp; </html>
-%% and also some "quotes" and 'single quotes'
-
--module(m1).
-
--compile(export_all).
-
--include("header1.hrl").
--include("header2.hrl").
--include("header3.hrl").
-
--define(MACRO1,value).
-
-%% This macro is used to select parser in erl2html2.
-%% If EPP_SWITCH is defined epp is used, else epp_dodger.
-epp_switch() ->
- ?EPP_SWITCH.
-
-%%% Comment
-foo(x) ->
- %% Comment
- ok_x;
-foo(y) ->
- %% Second clause
- ok_y.
-
-'quoted_foo'() ->
- ok.
-
-'quoted_foo_with_"_and_/'() ->
- ok.
-
-'quoted_foo_with_(_and_)'() ->
- ok.
-
-'quoted_foo_with_<_and_>'() ->
- ok.
-
-bar() ->
- do_something(),
-ok. % indentation error, OTP-9710
-
-%% Function inside macro definition
-?MACRO_DEFINING_A_FUNCTION.
-
-%% Two function one one line
-quuux() -> ok. quuuux() -> ok.
-
-%% do_something/0 does something
-do_something() ->
- ?MACRO1.
-%% comments after last line