aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-09-26Merge branch 'siri/reltool/spawn_executable/OTP-10358'Siri Hansen
* siri/reltool/spawn_executable/OTP-10358: [reltool] Use spawn_executable instead of spawn when starting nodes in test
2012-09-26Merge branch 'ia/ssl/reuse_session_expired-test'Ingela Anderton Andin
* ia/ssl/reuse_session_expired-test: ssl: Adopt test case to not take so long
2012-09-26Merge branch 'ia/ssh/empty-binary/OTP-9478'Ingela Anderton Andin
* ia/ssh/empty-binary/OTP-9478: ssh: Will not hang if you attempt to send empty binary
2012-09-26Merge branch 'bjorn/common_test/dialyzer-fixes'Björn Gustavsson
* bjorn/common_test/dialyzer-fixes: ct_master_logs: Don't use io:format/3 with an empty variable list common_test: Don't use undocumented features of io:format()
2012-09-25Merge branch 'egil/r16/strengthen-buffer-copies'Björn-Egil Dahlberg
* egil/r16/strengthen-buffer-copies: Replace sprintf with erts_snprintf in beam Replace sprintf with erts_snprintf in epmd Replace sprintf with erts_snprintf in inet_gethost
2012-09-25Merge branch 'maint'Björn-Egil Dahlberg
2012-09-25Merge branch 'egil/fix-configure-openbsd/OTP-10395' into maintBjörn-Egil Dahlberg
* egil/fix-configure-openbsd/OTP-10395: Fix linking of shared libraries on OpenBSD
2012-09-25Merge branch 'maint'Björn-Egil Dahlberg
2012-09-25Merge branch 'egil/fix-missing-modules-app/OTP-10439' into maintBjörn-Egil Dahlberg
* egil/fix-missing-modules-app/OTP-10439: tools: Add missing lcnt module to .app.src percept: Add missing modules to .app.src
2012-09-25ssl: Adopt test case to not take so longIngela Anderton Andin
2012-09-24ssh: Will not hang if you attempt to send empty binaryIngela Anderton Andin
2012-09-24[reltool] Use spawn_executable instead of spawn when starting nodes in testSiri Hansen
In order to handle paths with space, spawn_executable is now used instead of spawn when starting nodes with open_port/2 in reltool_server_SUITE.
2012-09-24Merge branch 'siri/common_test/undefined-snmp-funcs/OTP-10088'Siri Hansen
* siri/common_test/undefined-snmp-funcs/OTP-10088: [common_test] Moved ct_snmp_SUITE into data dir and run as other ct tests [common_test] Updated (minimized) config for ct_snmp test after fixing bugs [common_test] Use ct_snmp 'agent_vsns' config value in snmp app config [common_test] Change NotifType to atom instead of string [common_test] Remove calls to undefined functions from ct_snmp [common_test] Add minor test suite for ct_snmp Conflicts: lib/common_test/test/Makefile
2012-09-21Merge branch 'siri/reltool/misc-bugs/OTP-10012'Siri Hansen
* siri/reltool/misc-bugs/OTP-10012: [reltool] Use application name from .app file instead of directory name [reltool] Keep order from rel spec when sorting used and included applications [reltool] Automatically add included applications in rel file [reltool] Make reltool:install/2 work on windows [reltool] Allow incl_cond=derived on module level
2012-09-21[common_test] Moved ct_snmp_SUITE into data dir and run as other ct testsSiri Hansen
2012-09-21[common_test] Updated (minimized) config for ct_snmp test after fixing bugsSiri Hansen
Bugs reported in OTP-10432 allowed the config for ct_snmp test to specify only one version for agent and manager.
2012-09-21[common_test] Use ct_snmp 'agent_vsns' config value in snmp app configSiri Hansen
OTP-10432 Config parameter 'agent_vsns' in ct_snmp was ONLY used in call to snmp_config:write_agent_snmp_files. There it is only used for deciding if usm config shall be written (if v3 is included) or not. The value of 'agent_vsns' was NOT added to the snmp application's agent configuration, so the snmp application's own default value would be used - this is [v1,v2,v3]. The result was that if v3 was not included in 'agent_vsns', then usm.conf was not written, but when starting the agent it would complain that this file did not exist since snmp's default versions are all [v1,v2,v3]. This has been corrected - the 'agent_vsns' value is now inserted in the snmp application agent configuration as {versions,AgentVsns}.
2012-09-21[common_test] Change NotifType to atom instead of stringSiri Hansen
OTP-10432 In call to snmp_config:write_agent_snmp_files, the NotifType argument was earlier a string. This has been changed to an atom since it failed in snmp application and notify�conf was not created.
2012-09-21[reltool] Use application name from .app file instead of directory nameSiri Hansen
In the first traversal of library directories, reltool used only the directory names in order to figure out application names. This would succeed if the directory name was AppName only or AppName-AppVsn and AppVsn consisted of integers separated by dots only. If the AppVsn has any other format, then reltool would not find the correct application name. With this commit, reltool will first look for a .app file and use the .app file name as the application name. This will allow different formats of the version identifier in the directory name. Note that reltool can still not sort (and select the latest) amongst version identifiers of other format than integers separated by dots.
2012-09-20[common_test] Remove calls to undefined functions from ct_snmpSiri Hansen
2012-09-20[common_test] Add minor test suite for ct_snmpSiri Hansen
2012-09-20Merge branch 'bjorn/ct-fix-silent-death/OTP-9769'Björn Gustavsson
* bjorn/ct-fix-silent-death/OTP-9769: Teach test_server to report severe errors to common_test test_server_ctrl: Present "cannot create log dir" errors more neatly test_server_ctrl: Don't die in stop_extra_tools/1
2012-09-20Merge branch 'jv/filelib_recursion_wildcard'Henrik Nord
* jv/filelib_recursion_wildcard: Allow ** in filelib:wildcard OTP-10431
2012-09-20Merge branch 'bjorn/ts-fixes'Björn Gustavsson
* bjorn/ts-fixes: ts: Remove the non-working ts:clean/0,1 commands ts: Remove the obsolete ts:index/0 command ts: Remove the unused module ts_selftest ts_run: Make errors from ct:run_test/1 visible
2012-09-20ts: Remove the non-working ts:clean/0,1 commandsBjörn Gustavsson
The commands no longer work now that ts is a wrapper for common_test (instead of for test_server), and no one seems to have missed them.
2012-09-20ts: Remove the obsolete ts:index/0 commandBjörn Gustavsson
The ts:index/0 command only works with test_server log directories. The functionality to generate an overview of all tests run is now provided by common_test itself.
2012-09-20ts: Remove the unused module ts_selftestBjörn Gustavsson
2012-09-20ts_run: Make errors from ct:run_test/1 visibleBjörn Gustavsson
The ts wrapper module invokes common_test by calling the ct:run_test/1 function using "erl -eval Cmd". Since ct:run_test/1 is intended to by called from the Erlang shell, it returns error values rather than printing them. Therefore, when an error occurs, users of ts may not see any error indication. Introduce the ts_run:ct_run_test/2 wrapper which invokes ct:run_test/1 and prints out any error that occurs.
2012-09-20ct_master_logs: Don't use io:format/3 with an empty variable listBjörn Gustavsson
It is bad practice to use an arbitrary string as a format string for io:format(), since it could contain a '~' character which could trigger a badarg exception. Therefore, replace all io:format/3 calls that looks like: io:format(Fd, String, []) with: io:put_chars(Fd, String)
2012-09-20common_test: Don't use undocumented features of io:format()Björn Gustavsson
The Format string argument for io:format() is not documented to accept an iolist, so we should not depend on it. Also, it is bad practice to use an arbitrary string as a format string for io:format(), since it could contain a '~' character which could trigger a badarg exception. Fix both problems at the same time by using io:put_chars() to display the iolist.
2012-09-19Merge branch 'henrik/undef-fix/OTP-10428'Henrik Nord
* henrik/undef-fix/OTP-10428: ignore calls to gs* modules if it is not built
2012-09-19ignore calls to gs* modules if it is not builtHenrik Nord
2012-09-19Merge branch 'bjorn/kernel/global-resolve-function-fix/OTP-10419'Björn Gustavsson
* bjorn/kernel/global-resolve-function-fix/OTP-10419: global: Allow "tuple funs" as resolve functions
2012-09-19Teach test_server to report severe errors to common_testBjörn Gustavsson
If a severe error occurs in test_server (e.g. failing to write to log files), test_server would terminate without commont_test knowing about it. Since ct_run can now return an exit code, it is important that common_test is aware of severe problem so that it can indicate that an error has occurred.
2012-09-19test_server_ctrl: Present "cannot create log dir" errors more neatlyBjörn Gustavsson
2012-09-19test_server_ctrl: Don't die in stop_extra_tools/1Björn Gustavsson
If it is not possible for test_server_ctrl:start_log_file/0 to create the log file directory or log files, then stop_extra_tools/1 (called from init_tester/10) is also likely to crash and hide the original error reason. That will be confusing to the user. Therefore, catch the call to stop_extra_tools/1.
2012-09-17global: Allow "tuple funs" as resolve functionsBjörn Gustavsson
Commit de7e01c958ff7c9e6da4034a53567a30a4ae5792 removed support for tuple funs. To still allow resolve functions for global:{re_}register_name/3 to be specified as {M,F}, we'll need to translate {M,F} to an external fun. Also update the documentation to mention that the use of {M,F} to specify a resolve function is deprecated, and to add a recommendation to use an external fun.
2012-09-17[reltool] Keep order from rel spec when sorting used and included applicationsSiri Hansen
The rel specification now dictates the order in which included and used applications are loaded/started by the boot file. If the applications are not specified in the rel spec, then the order from the .app file is used. This was a bug earlier reported on systools, and is now also implemented in reltool. Example: If a .app file specified {applications,[x,y]} {included_applications,[b,c]} And the reltool.config has {rel, "myrel", "1.0", [a,y,x,c,b]} Then the boot file will load/start y before x and c before b. Earlier x would always be started before y and b always before c due to the order in the .app file.
2012-09-17Allow ** in filelib:wildcardJosé Valim
Two adjacent * used as a single pattern will match all files and zero or more directories and subdirectories.
2012-09-17Merge branch 'bjorn/stdlib/filelib-wildcard/OTP-6874'Björn Gustavsson
* bjorn/stdlib/filelib-wildcard/OTP-6874: Fix filelib:wildcard/2
2012-09-14[reltool] Automatically add included applications in rel fileSiri Hansen
If a 'rel' spec in the reltool config does not contain all applications that are listed as {applications,Applications} in a .app file, then these applications are autmatically added when creating the .rel file. For 'included_applications', the behaviour was not the same. I.e. if a 'rel' spec in the reltool config did not contain all applications that are listed as {included_applications,InclApplications} in a .app file, then reltool would fail with reason "Undefined applications" when creating the .rel file. This has been corrected, so both 'applications' and 'included_applications' are now automatically added if not already in the 'rel' spec. I.e. for an application 'z', if z.app contains {applications,[stdlib,kernel,x]} {included_applications,[y]} then reltool configuration {rel, "myrel", "1.0", [z]} will cause the same .rel file as {rel, "myrel", "1.0", [stdlib,kernel,x,y,z]}
2012-09-14Merge branch 'siri/dont-allow-modvsn-in-app-file/OTP-10417'Siri Hansen
* siri/dont-allow-modvsn-in-app-file/OTP-10417: Don't allow {Mod,Vsn} in modules list in .app file
2012-09-13Don't allow {Mod,Vsn} in modules list in .app fileSiri Hansen
It was possible to insert {Mod::atom(),Vsn::term()} instead of Mod::atom() in the modules list in a .app file. This was not visible in the documentation of .app files, but it was visible in the documentation of application:load/[1,2] (where the .app file term can be used directly as first argument). The Vsn part was never used, so this possibility has now been removed.
2012-09-13Merge branch 'sverk/gcc-atomic-config-bug' into maintSverker Eriksson
* sverk/gcc-atomic-config-bug: erts: Fix gcc atomic bug in ethread.h OTP-10418
2012-09-12Merge remote branch 'upstream/maint'Peter Andersson
2012-09-12Merge branch 'maint-r15' into maintPeter Andersson
2012-09-12Merge branch 'siri/sasl/dont_destroy_test_dir/OTP-10394'Siri Hansen
* siri/sasl/dont_destroy_test_dir/OTP-10394: Skip release_handler test related to symlinks on windows
2012-09-12[reltool] Make reltool:install/2 work on windowsSiri Hansen
The erl.ini file generated by reltool:install/2 faulty pointed out $ROOT/bin as Bindir. This is now changed to $ROOT/erts-Vsn/bin. Also, backslashes in erl.ini needed to be escaped.
2012-09-12Fix filelib:wildcard/2Björn Gustavsson
filelib:wildcard("some/relative/path/*.beam", Path) would fail to match any file. That is, filelib:wildcard/2 would not work if the first component of the pattern did not contain any wildcard characters. Noticed-by: Samuel Rivas
2012-09-11Skip release_handler test related to symlinks on windowsSiri Hansen