summaryrefslogtreecommitdiff
path: root/lib/test_server
Commit message (Expand)AuthorAgeFilesLines
* Fix problem not recognizing 'macro' tuple from epp_dodgerPeter Andersson2015-05-134-18/+34
* Fix failing test case and handling double functions on one linePeter Andersson2015-05-132-18/+25
* Revert "Prepare release"Henrik Nord2015-05-131-49/+0
* Prepare releaseErlang/OTP2015-05-121-0/+49
* Merge branch 'peppe/test_tools_vsn_and_deps'Peter Andersson2015-05-112-4/+4
|\
| * Update version numbers and app dependenciesPeter Andersson2015-05-082-4/+4
* | Merge branch 'peppe/ts/fix_benchmarks'Peter Andersson2015-05-111-4/+14
|\ \
| * | Fix problem with OTP benchmark tests failing to runPeter Andersson2015-05-091-4/+14
* | | Merge branch 'peppe/test_server/fix_merge_problems'Peter Andersson2015-05-111-16/+14
|\ \ \ | |/ / |/| |
| * | Fix remaining issues in source code parserPeter Andersson2015-05-091-16/+14
| |/
* | Merge branch 'rickard/time-improvement/OTP-11997'Rickard Green2015-05-081-1/+1
|\ \ | |/ |/|
| * Replace usage of erlang:now() in line-tracingRickard Green2015-05-061-1/+1
* | Merge branch 'richcarl/md5-fixes'Björn Gustavsson2015-05-081-5/+1
|\ \
| * | Add module_info entry for native codeRichard Carlsson2015-05-071-5/+1
* | | Merge branch 'nox/test_server-lines'Zandra Hird2015-05-082-66/+28
|\ \ \
| * | | Undocument the line macro in test_serverAnthony Ramine2015-03-212-66/+28
* | | | Merge branch 'egil/fix-ts_install-hook'Björn-Egil Dahlberg2015-05-071-4/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | test_server: Fix install_hookBjörn-Egil Dahlberg2015-04-271-4/+10
* | | | Merge branch 'maint'Zandra Hird2015-05-065-50/+134
|\ \ \ \
| * | | | Prepare releaseErlang/OTP2015-05-061-0/+22
| * | | | Merge branch 'peppe/common_test/timetrap_line.maint' into maint-17Erlang/OTP2015-05-063-48/+110
| |\ \ \ \
| | * | | | Fix problem with line number not always showing in logPeter Andersson2015-05-043-48/+110
| * | | | | Bump version numbersPeter Andersson2015-05-041-1/+1
| |/ / / /
* | | | | Merge branch 'peppe/add_obsolete_app_warnings'Peter Andersson2015-05-041-0/+4
|\ \ \ \ \
| * | | | | Declare webtool and test_server as obsoletePeter Andersson2015-04-231-0/+4
* | | | | | Merge remote-tracking branch 'origin/peppe/common_test/improve_suite_error_re...Peter Andersson2015-05-041-5/+13
|\ \ \ \ \ \
| * | | | | | Improve error reports in log when suite compilation failsPeter Andersson2015-04-161-5/+13
| |/ / / / /
* | | | | | Merge remote-tracking branch 'origin/peppe/common_test/test_categories'Peter Andersson2015-05-042-239/+408
|\ \ \ \ \ \
| * | | | | | Reintroduce functions for backwards compatibilityPeter Andersson2015-04-152-2/+39
| * | | | | | Introduce test categories for OTP testsPeter Andersson2015-04-152-239/+371
| |/ / / / /
* | | | | | test_server: Use module erl_annoHans Bolinder2015-04-301-5/+10
| |_|/ / / |/| | | |
* | | | | test_server: Use erlang:monotonic_time/0Björn Gustavsson2015-04-201-3/+4
|/ / / /
* | | | Fix problem with suite compilation failures not being correctly reportedPeter Andersson2015-04-131-39/+51
* | | | Merge tag 'OTP-17.5'Henrik Nord2015-04-012-1/+46
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Prepare releaseErlang/OTP2015-03-312-1/+46
* | | Merge branch 'rickard/time_api/OTP-11997'Rickard Green2015-03-206-58/+36
|\ \ \
| * | | test_server: Replace usage of erlang:now() with usage of new APIDan Gudmundsson2015-03-206-58/+36
* | | | Merge branch 'maint'Peter Andersson2015-03-181-33/+29
|\ \ \ \ | | |/ / | |/| |
| * | | Always report ok to event handlers after successful cfg or tc funcPeter Andersson2015-03-181-33/+29
* | | | Merge branch 'maint'Peter Andersson2015-03-181-3/+50
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/peppe/fix_xcomp' into maintPeter Andersson2015-03-181-3/+50
| |\ \ \
| | * | | Fix problem with variables not getting assigned during installationPeter Andersson2015-03-131-3/+50
* | | | | Merge branch 'maint'Peter Andersson2015-03-182-23/+36
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Modify the top section of the test case log filePeter Andersson2015-03-152-23/+36
| |/ /
* | | Merge branch 'egil/revert-os_getenv-test_server'Björn-Egil Dahlberg2015-03-121-2/+14
|\ \ \
| * | | Revert "Start using os:getenv/2 fun" in test_serverBjörn-Egil Dahlberg2015-01-091-2/+14
* | | | Merge branch 'maint'Peter Andersson2015-03-061-30/+60
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/peppe/common_test/inconsistent_return_va...Peter Andersson2015-03-061-30/+60
| |\ \ \
| | * | | Make it possible to skip test case by returning skipped tagPeter Andersson2015-01-271-30/+60
| | | |/ | | |/|
* | | | Merge branch 'maint'Björn-Egil Dahlberg2015-03-051-1/+11
|\ \ \ \ | |/ / /