Permalink
Browse files

Merge branch 'peppe/common_test_r14_dev_2' into dev

* peppe/common_test_r14_dev_2:
  Misc documentation updates
  Add documentation for run_test program
  Step vsn for test_server to 3.4
  Make {repeat*,N} property in group execute the group N times exactly
  Fix so that ct_run converts relative diretories in the code path to absolute
  Fix bug in handling framework:end_tc timeouts
  Fix bug that prevents the interactive shell mode to start properly
  Fix failing multiply timetrap test case
  Minor fixes in code and test suites
  Add support for executing pre-loaded suites (e.g. modules loaded as binaries)
  Add test suite for remote loading of binary suites
  Fix error with {repeat,0} property in groups causing double iterations
  Add support for config info functions (e.g. init_per_suite/0)
  Add support for dynamic timetrap handling
  Have end_per_testcase run even after timetrap_timeout and abort_testcase
  Flush old DOWN messages in demonitor
  Add groups in test specifications
  Add new tests for test case groups and test specifications
  Improve and fix various test suites
  Add event_handler_init start flag that can pass init arguments to event handlers
  ...

OTP-8703 peppe/common_test_r14_dev_2
  • Loading branch information...
2 parents a28aa32 + 2d7ba88 commit c0f23851df50d6215981805102754b590c05acec Erlang/OTP committed Jun 11, 2010
Showing with 8,796 additions and 2,537 deletions.
  1. +1 −1 Makefile.in
  2. +8 −5 erts/Makefile.in
  3. +10 −2 erts/etc/common/Makefile.in
  4. +514 −0 erts/etc/common/run_test.c
  5. +1 −0 erts/etc/unix/Install.src
  6. +7 −7 erts/etc/win32/Install.c
  7. +8 −8 lib/common_test/Makefile
  8. +2 −1 lib/common_test/doc/src/Makefile
  9. +5 −5 lib/common_test/doc/src/common_test_app.xml
  10. +238 −14 lib/common_test/doc/src/config_file_chapter.xml
  11. +57 −5 lib/common_test/doc/src/ct_master_chapter.xml
  12. +10 −12 lib/common_test/doc/src/event_handler_chapter.xml
  13. +67 −72 lib/common_test/doc/src/install_chapter.xml
  14. +4 −3 lib/common_test/doc/src/ref_man.xml
  15. +69 −39 lib/common_test/doc/src/run_test.xml
  16. +56 −22 lib/common_test/doc/src/run_test_chapter.xml
  17. +5 −5 lib/common_test/doc/src/test_structure_chapter.xml
  18. +37 −7 lib/common_test/doc/src/write_test_chapter.xml
  19. +10 −6 lib/common_test/src/Makefile
  20. +11 −6 lib/common_test/src/common_test.app.src
  21. +116 −25 lib/common_test/src/ct.erl
  22. +786 −0 lib/common_test/src/ct_config.erl
  23. +109 −0 lib/common_test/src/ct_config_plain.erl
  24. +118 −0 lib/common_test/src/ct_config_xml.erl
  25. +31 −12 lib/common_test/src/ct_framework.erl
  26. +7 −7 lib/common_test/src/ct_gen_conn.erl
  27. +8 −8 lib/common_test/src/ct_logs.erl
  28. +114 −28 lib/common_test/src/ct_master.erl
  29. +7 −7 lib/common_test/src/ct_master_logs.erl
  30. +6 −6 lib/common_test/src/ct_repeat.erl
  31. +1,010 −672 lib/common_test/src/ct_run.erl
  32. +439 −0 lib/common_test/src/ct_slave.erl
  33. +11 −11 lib/common_test/src/ct_snmp.erl
  34. +31 −30 lib/common_test/src/ct_telnet_client.erl
  35. +280 −35 lib/common_test/src/ct_testspec.erl
  36. +45 −608 lib/common_test/src/ct_util.erl
  37. +5 −0 lib/common_test/src/ct_util.hrl
  38. +13 −11 lib/common_test/src/vts.erl
  39. +8 −4 lib/common_test/test/Makefile
  40. +255 −0 lib/common_test/test/ct_config_SUITE.erl
  41. +31 −0 lib/common_test/test/ct_config_SUITE_data/config/config.txt
  42. +27 −0 lib/common_test/test/ct_config_SUITE_data/config/config.xml
  43. +46 −0 lib/common_test/test/ct_config_SUITE_data/config/test/config_driver.erl
  44. +145 −0 lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
  45. +93 −0 lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl
  46. +123 −0 lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
  47. +229 −14 lib/common_test/test/ct_error_SUITE.erl
  48. +123 −0 lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_10_SUITE.erl
  49. +134 −0 lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_11_SUITE.erl
  50. +88 −0 lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
  51. +47 −0 lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl
  52. +46 −0 lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl
  53. +2 −1 lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl
  54. +194 −0 lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
  55. +138 −0 lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
  56. +4 −5 lib/common_test/test/ct_event_handler_SUITE.erl
  57. +18 −5 lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
  58. +48 −60 lib/common_test/test/ct_groups_test_1_SUITE.erl
  59. +7 −3 lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl
  60. +3 −3 lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl
  61. +166 −4 lib/common_test/test/ct_groups_test_2_SUITE.erl
  62. +1 −0 lib/common_test/test/ct_groups_test_2_SUITE_data/cfgs/groups_2.1.cfg
  63. +105 −0 lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl
  64. +281 −0 lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_21_SUITE.erl
  65. +314 −0 lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
  66. +26 −0 lib/common_test/test/ct_groups_test_2_SUITE_data/specs/groups_2.1.spec
  67. +136 −0 lib/common_test/test/ct_master_SUITE.erl
  68. +2 −0 lib/common_test/test/ct_master_SUITE_data/master/config.txt
  69. +4 −0 lib/common_test/test/ct_master_SUITE_data/master/config.xml
  70. +57 −0 lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl
  71. +165 −0 lib/common_test/test/ct_misc_1_SUITE.erl
  72. +134 −0 lib/common_test/test/ct_misc_1_SUITE_data/beam_1_SUITE.erl
  73. +134 −0 lib/common_test/test/ct_misc_1_SUITE_data/beam_2_SUITE.erl
  74. +13 −4 lib/common_test/test/ct_skip_SUITE.erl
  75. +30 −22 lib/common_test/test/ct_smoke_test_SUITE.erl
  76. +13 −4 lib/common_test/test/ct_test_server_if_1_SUITE.erl
  77. +6 −2 lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
  78. +102 −18 lib/common_test/test/ct_test_support.erl
  79. +20 −7 lib/common_test/test/ct_test_support_eh.erl
  80. +32 −0 lib/common_test/test/ct_userconfig_callback.erl
  81. +1 −1 lib/common_test/vsn.mk
  82. +16 −0 lib/test_server/doc/src/test_server.xml
  83. +25 −0 lib/test_server/doc/src/test_server_ctrl.xml
  84. +350 −188 lib/test_server/src/test_server.erl
  85. +564 −485 lib/test_server/src/test_server_ctrl.erl
  86. +11 −3 lib/test_server/src/test_server_sup.erl
  87. +5 −8 lib/test_server/src/ts_erl_config.erl
  88. +1 −1 lib/test_server/test/test_server_SUITE.erl
  89. +1 −1 lib/test_server/vsn.mk
  90. +5 −5 lib/webtool/doc/src/start_webtool.xml
  91. +10 −8 lib/webtool/src/webtool.erl
  92. +1 −1 lib/webtool/vsn.mk
View
@@ -119,7 +119,7 @@ BINDIR = $(DESTDIR)$(EXTRA_PREFIX)$(bindir)
#
# Erlang base public files
#
-ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript
+ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript run_test
# ERLANG_INST_LIBDIR is the top directory where the Erlang installation
# will be located when running.
View
@@ -1,19 +1,19 @@
#
# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2006-2009. All Rights Reserved.
-#
+#
+# Copyright Ericsson AB 2006-2010. All Rights Reserved.
+#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
# compliance with the License. You should have received a copy of the
# Erlang Public License along with this software. If not, it can be
# retrieved online at http://www.erlang.org/.
-#
+#
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
# the License for the specific language governing rights and limitations
# under the License.
-#
+#
# %CopyrightEnd%
#
include $(ERL_TOP)/make/target.mk
@@ -92,10 +92,12 @@ local_setup:
$(ERL_TOP)/bin/escript $(ERL_TOP)/bin/escript.exe \
$(ERL_TOP)/bin/dialyzer $(ERL_TOP)/bin/dialyzer.exe \
$(ERL_TOP)/bin/typer $(ERL_TOP)/bin/typer.exe \
+ $(ERL_TOP)/bin/run_test $(ERL_TOP)/bin/run_test.exe \
$(ERL_TOP)/bin/start*.boot $(ERL_TOP)/bin/start*.script
@if [ "X$(TARGET)" = "Xwin32" ]; then \
cp $(ERL_TOP)/bin/$(TARGET)/dialyzer.exe $(ERL_TOP)/bin/dialyzer.exe; \
cp $(ERL_TOP)/bin/$(TARGET)/typer.exe $(ERL_TOP)/bin/typer.exe; \
+ cp $(ERL_TOP)/bin/$(TARGET)/run_test.exe $(ERL_TOP)/bin/run_test.exe; \
cp $(ERL_TOP)/bin/$(TARGET)/erlc.exe $(ERL_TOP)/bin/erlc.exe; \
cp $(ERL_TOP)/bin/$(TARGET)/erl.exe $(ERL_TOP)/bin/erl.exe; \
cp $(ERL_TOP)/bin/$(TARGET)/werl.exe $(ERL_TOP)/bin/werl.exe; \
@@ -115,6 +117,7 @@ local_setup:
$(ERL_TOP)/erts/etc/unix/cerl.src > $(ERL_TOP)/bin/cerl; \
cp $(ERL_TOP)/bin/$(TARGET)/dialyzer $(ERL_TOP)/bin/dialyzer; \
cp $(ERL_TOP)/bin/$(TARGET)/typer $(ERL_TOP)/bin/typer; \
+ cp $(ERL_TOP)/bin/$(TARGET)/run_test $(ERL_TOP)/bin/run_test; \
cp $(ERL_TOP)/bin/$(TARGET)/erlc $(ERL_TOP)/bin/erlc; \
cp $(ERL_TOP)/bin/$(TARGET)/escript $(ERL_TOP)/bin/escript; \
chmod 755 $(ERL_TOP)/bin/erl $(ERL_TOP)/bin/erlc \
@@ -178,7 +178,7 @@ MC_OUTPUTS= \
MT_FLAG="-MD"
endif
INET_GETHOST = $(BINDIR)/inet_gethost.exe
-INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer.exe $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe
+INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer.exe $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe $(BINDIR)/run_test.exe
INSTALL_SRC = $(WINETC)/start_erl.c $(WINETC)/Nmakefile.start_erl
ERLEXECDIR=.
INSTALL_LIBS =
@@ -211,7 +211,7 @@ ERLSRV_OBJECTS=
MC_OUTPUTS=
INET_GETHOST = $(BINDIR)/inet_gethost@EXEEXT@
INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer@EXEEXT@ $(BINDIR)/dialyzer@EXEEXT@ \
- $(BINDIR)/erlc@EXEEXT@ $(BINDIR)/escript@EXEEXT@ \
+ $(BINDIR)/erlc@EXEEXT@ $(BINDIR)/escript@EXEEXT@ $(BINDIR)/run_test@EXEEXT@ \
$(BINDIR)/run_erl $(BINDIR)/to_erl $(BINDIR)/dyn_erl
INSTALL_EMBEDDED_DATA = ../unix/start.src ../unix/start_erl.src
INSTALL_TOP = Install
@@ -274,6 +274,7 @@ endif
rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/dyn_erl.o
rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/safe_string.o
rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/typer.o
+ rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/run_test.o
rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/vxcall.o
rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/erl.o
rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/werl.o
@@ -349,6 +350,13 @@ $(BINDIR)/escript@EXEEXT@: $(OBJDIR)/escript.o
$(OBJDIR)/escript.o: escript.c
$(CC) $(CFLAGS) -o $@ -c escript.c
+$(BINDIR)/run_test@EXEEXT@: $(OBJDIR)/run_test.o
+ $(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_test.o -L$(OBJDIR) $(LIBS)
+
+$(OBJDIR)/run_test.o: run_test.c
+ $(CC) $(CFLAGS) -o $@ -c run_test.c
+
+
#------------------------------------------------------------------------
# Windows specific targets
# The windows platform is quite different from the others. erl/werl are small C programs
Oops, something went wrong.

0 comments on commit c0f2385

Please sign in to comment.