Permalink
Browse files

Merge branch 'master' of git://git.process-one.net/tsung/mainline int…

…o p1

Conflicts:
	src/tsung/ts_http.erl
	src/tsung/ts_jabber.erl
	src/tsung/ts_jabber_common.erl
	src/tsung/ts_search.erl
	src/tsung_controller/ts_config.erl
	src/tsung_controller/ts_config_jabber.erl
	src/tsung_controller/ts_config_server.erl
	tsung-1.0.dtd
  • Loading branch information...
2 parents c3426b5 + 78ff62e commit 10d19f33299c39bdd19a5f156b84940ae0e68711 @cstar cstar committed Nov 26, 2010
Showing with 2,860 additions and 2,411 deletions.
  1. +10 −0 CHANGES
  2. +9 −6 Makefile.in
  3. +183 −10 configure
  4. +18 −2 configure.in
  5. +6 −0 debian/changelog
  6. +145 −14 doc/user_manual.html
  7. +85 −7 doc/user_manual.tex
  8. +5 −2 include/ts_config.hrl
  9. +5 −2 include/ts_http.hrl
  10. +2 −1 include/ts_jabber.hrl
  11. +47 −0 include/ts_shell.hrl
  12. +1 −1 src/lib/mochijson2.erl
  13. +0 −949 src/lib/snmp_mgr.erl
  14. +0 −713 src/lib/snmp_mgr_misc.erl
  15. +28 −28 src/templates/graph.thtml
  16. +55 −19 src/test/ts_test_config.erl
  17. +38 −1 src/test/ts_test_http.erl
  18. +5 −3 src/test/ts_test_jabber.erl
  19. +18 −16 src/test/ts_test_proxy.erl
  20. +4 −4 src/test/ts_test_recorder.erl
  21. +129 −11 src/test/ts_test_search.erl
  22. +136 −0 src/test/xmpp-muc.xml.in
  23. +169 −27 src/tsung/ts_client.erl
  24. +150 −0 src/tsung/ts_cport.erl
  25. +13 −4 src/tsung/ts_fs.erl
  26. +137 −24 src/tsung/ts_http.erl
  27. +51 −23 src/tsung/ts_http_common.erl
  28. +186 −0 src/tsung/ts_ip_scan.erl
  29. +66 −30 src/tsung/ts_jabber.erl
  30. +43 −23 src/tsung/ts_jabber_common.erl
  31. +36 −24 src/tsung/ts_launcher.erl
  32. +6 −1 src/tsung/ts_launcher_mgr.erl
  33. +8 −0 src/tsung/ts_ldap.erl
  34. +4 −4 src/tsung/ts_mon_cache.erl
  35. +8 −0 src/tsung/ts_mysql.erl
  36. +9 −0 src/tsung/ts_pgsql.erl
  37. +8 −0 src/tsung/ts_raw.erl
  38. +58 −43 src/tsung/ts_search.erl
  39. +160 −0 src/tsung/ts_shell.erl
  40. +11 −2 src/tsung/ts_sup.erl
  41. +67 −63 src/tsung/ts_utils.erl
  42. +7 −0 src/tsung/ts_webdav.erl
  43. +1 −1 src/tsung/tsung.erl
  44. +135 −56 src/tsung_controller/ts_config.erl
  45. +1 −1 src/tsung_controller/ts_config_fs.erl
  46. +12 −4 src/tsung_controller/ts_config_http.erl
  47. +21 −2 src/tsung_controller/ts_config_jabber.erl
  48. +189 −121 src/tsung_controller/ts_config_server.erl
  49. +67 −0 src/tsung_controller/ts_config_shell.erl
  50. +19 −12 src/tsung_controller/ts_match_logger.erl
  51. +43 −22 src/tsung_controller/ts_mon.erl
  52. +44 −38 src/tsung_controller/ts_os_mon_snmp.erl
  53. +31 −32 src/tsung_controller/ts_timer.erl
  54. +31 −11 src/tsung_controller/ts_user_server.erl
  55. +1 −1 src/tsung_controller/tsung_controller.app.src.in
  56. +12 −12 src/tsung_recorder/ts_client_proxy.erl
  57. +4 −4 src/tsung_recorder/ts_proxy_http.erl
  58. +3 −3 src/tsung_recorder/ts_proxy_recorder.erl
  59. +52 −10 src/tsung_stats.pl.in
  60. +50 −19 tsung-1.0.dtd
  61. +1 −1 tsung-recorder.sh.in
  62. +16 −3 tsung.sh.in
  63. +1 −1 vsn.mk
View
10 CHANGES
@@ -1,3 +1,13 @@
+1.3.2 -> 1.3.3 Minor bugfixes (17 Aug 2010)
+Bugfix:
+ * [TSUN-154] - parent proxy doesn't work anymore in 1.3.x (tested with 1.3.2 and 1.3.0).
+ * [TSUN-155] - url substitution is broken in some cases
+ * [TSUN-156] - Tsung not using sessions with low probabilities
+ * [TSUN-157] - ssl doesn't work with erlang R14A
+ * [TSUN-158] - failure when a proxy is used and an URL substitution is set
+ * [TSUN-159] - HTTP cookies support is broken when a proxy is used
+ * [TSUN-160] - tsung can sometimes hang at the beginning using distributed setup
+ * [TSUN-161] - if statement not allowed in a transaction
1.3.1 -> 1.3.2 Major bugfixes and enhancements (14 Jun 2010)
Bugfix:
* [TSUN-128] - Apostrophes cause string to convert to deep list in setdynvars with Erlang function.
View
@@ -296,8 +296,8 @@ boot: tsung priv/tsung.boot priv/tsung_recorder.boot priv/tsung_controller.boot
priv/tsung.boot: builder.beam $(SRC_APPFILES)
# use builder to make boot file
@rm -rf temp
- @mkdir -p temp/lib/$(APPLICATION)-$(VERSION)
- @ln -sf $(PWD)/ebin temp/lib/$(APPLICATION)-$(VERSION)/ebin
+ @mkdir -p temp/lib/$(APPLICATION)-$(VERSION)/ebin
+ @cp $(TARGET) $(LIB_TARGET) temp/lib/$(APPLICATION)-$(VERSION)/ebin
@ln -sf $(PWD)/src/$(APPLICATION) temp/lib/$(APPLICATION)-$(VERSION)/src
@ln -sf $(PWD)/include temp/lib/$(APPLICATION)-$(VERSION)/include
@ln -sf $(PWD)/priv temp/lib/$(APPLICATION)-$(VERSION)/priv
@@ -308,14 +308,15 @@ priv/tsung.boot: builder.beam $(SRC_APPFILES)
&& echo $(BUILD_OPTIONS) > $(BUILD_OPTIONS_FILE) \
&& $(ERL) -noshell -s builder go -s init stop >> $(BUILDER_LOG) 2>&1 \
)
+ @cp temp/lib/$(APPLICATION)-$(VERSION)/ebin/*.app ebin
@rm -rf temp
@echo "done"
priv/tsung_controller.boot: builder.beam $(CONTROLLER_SRC_APPFILES)
# use builder to make boot file
@rm -rf temp
- @mkdir -p temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)
- @ln -sf $(PWD)/ebin temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/ebin
+ @mkdir -p temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/ebin
+ @cp $(CONTROLLER_TARGET) temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/ebin
@ln -sf $(PWD)/src/$(CONTROLLER_APPLICATION) temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/src
@ln -sf $(PWD)/include temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/include
@ln -sf $(PWD)/priv temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/priv
@@ -325,14 +326,15 @@ priv/tsung_controller.boot: builder.beam $(CONTROLLER_SRC_APPFILES)
&& echo $(BUILD_OPTIONS) > $(BUILD_OPTIONS_FILE) \
&& $(ERL) -noshell -s builder go -s init stop >> $(BUILDER_LOG) 2>&1 \
)
+ @cp temp/lib/$(CONTROLLER_APPLICATION)-$(VERSION)/ebin/*.app ebin
@rm -rf temp
@echo "done"
priv/tsung_recorder.boot: builder.beam $(RECORDER_SRC_APPFILES)
# use builder to make boot file
@rm -rf temp
- @mkdir -p temp/lib/$(RECORDER_APPLICATION)-$(VERSION)
- @ln -sf $(PWD)/ebin temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/ebin
+ @mkdir -p temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/ebin
+ @cp $(RECORDER_TARGET) temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/ebin
@ln -sf $(PWD)/src/$(RECORDER_APPLICATION) temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/src
@ln -sf $(PWD)/include temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/include
@ln -sf $(PWD)/priv temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/priv
@@ -342,6 +344,7 @@ priv/tsung_recorder.boot: builder.beam $(RECORDER_SRC_APPFILES)
&& echo $(BUILD_OPTIONS) > $(BUILD_OPTIONS_FILE) \
&& $(ERL) -noshell -s builder go -s init stop >> $(BUILDER_LOG) 2>&1 \
)
+ @cp temp/lib/$(RECORDER_APPLICATION)-$(VERSION)/ebin/*.app ebin
@rm -rf temp
@echo "done"
View
193 configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for tsung 1.3.2.
+# Generated by GNU Autoconf 2.63 for tsung 1.4.0a.
#
# Report bugs to <tsung-users@process-one.net>.
#
@@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='tsung'
PACKAGE_TARNAME='tsung'
-PACKAGE_VERSION='1.3.2'
-PACKAGE_STRING='tsung 1.3.2'
+PACKAGE_VERSION='1.4.0a'
+PACKAGE_STRING='tsung 1.4.0a'
PACKAGE_BUGREPORT='tsung-users@process-one.net'
ac_unique_file="src/tsung/tsung.erl"
@@ -616,6 +616,8 @@ DTD
ERLANG_APPLICATIONS
ERL_OPTS
erlang_cv_orelse
+ERLANG_LIB_VER_public_key
+ERLANG_LIB_DIR_public_key
ERLANG_LIB_VER_crypto
ERLANG_LIB_DIR_crypto
ERLANG_LIB_VER_ssl
@@ -1230,7 +1232,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tsung 1.3.2 to adapt to many kinds of systems.
+\`configure' configures tsung 1.4.0a to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1291,7 +1293,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tsung 1.3.2:";;
+ short | recursive ) echo "Configuration of tsung 1.4.0a:";;
esac
cat <<\_ACEOF
@@ -1371,7 +1373,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tsung configure 1.3.2
+tsung configure 1.4.0a
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1387,7 +1389,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tsung $as_me 1.3.2, which was
+It was created by tsung $as_me 1.4.0a, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2779,6 +2781,113 @@ ERLANG_LIB_VER_crypto=$erlang_cv_lib_ver_crypto
+{ $as_echo "$as_me:$LINENO: checking for Erlang/OTP 'public_key' library subdirectory" >&5
+$as_echo_n "checking for Erlang/OTP 'public_key' library subdirectory... " >&6; }
+if test "${erlang_cv_lib_dir_public_key+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=erl
+ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 ; echo "#!/bin/sh" > conftest$ac_exeext ; $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
+ if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+-module(conftest).
+-export([start/0]).
+
+start() ->
+ ReturnValue = case code:lib_dir("public_key") of
+ {error, bad_name} ->
+ file:write_file("conftest.out", "not found\n"),
+ 1;
+ LibDir ->
+ file:write_file("conftest.out", LibDir),
+ 0
+ end,
+ halt(ReturnValue)
+.
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ erlang_cv_lib_dir_public_key=`cat conftest.out`
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test ! -f conftest.out; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: test Erlang program execution failed
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: test Erlang program execution failed
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+ else
+ erlang_cv_lib_dir_public_key="not found"
+ fi
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+ ac_ext=erl
+ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 ; echo "#!/bin/sh" > conftest$ac_exeext ; $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $erlang_cv_lib_dir_public_key" >&5
+$as_echo "$erlang_cv_lib_dir_public_key" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for Erlang/OTP 'public_key' library version" >&5
+$as_echo_n "checking for Erlang/OTP 'public_key' library version... " >&6; }
+if test "${erlang_cv_lib_ver_public_key+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$erlang_cv_lib_dir_public_key" = "not found"; then
+ erlang_cv_lib_ver_public_key="not found"
+else
+ erlang_cv_lib_ver_public_key=`$as_echo "$erlang_cv_lib_dir_public_key" | sed -n -e 's,^.*-\([^/-]*\)$,\1,p'`
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $erlang_cv_lib_ver_public_key" >&5
+$as_echo "$erlang_cv_lib_ver_public_key" >&6; }
+ERLANG_LIB_DIR_public_key=$erlang_cv_lib_dir_public_key
+
+ERLANG_LIB_VER_public_key=$erlang_cv_lib_ver_public_key
+
+
+
{ $as_echo "$as_me:$LINENO: checking if Erlang/OTP SSL application is running fine" >&5
$as_echo_n "checking if Erlang/OTP SSL application is running fine... " >&6; }
@@ -2838,8 +2947,63 @@ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
+
+ if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+-module(conftest).
+-export([start/0]).
+
+start() ->
+ application:start(crypto),
+ application:start(public_key),
+ case application:start(ssl) of
+ ok -> ok;
+ Err -> halt(1)
+ end,
+ halt(0)
+.
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ erlang_cv_ssl_runnable=yes
+ ERLANG_APPLICATIONS="kernel,stdlib,crypto,public_key,ssl"
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
ERLANG_APPLICATIONS="kernel,stdlib"
- { $as_echo "$as_me:$LINENO: result: WARNING: ssl application is not working properly !!!" >&5
+ { $as_echo "$as_me:$LINENO: result: WARNING: ssl application is not working properly !!!" >&5
$as_echo "WARNING: ssl application is not working properly !!!" >&6; }
fi
rm -rf conftest.dSYM
@@ -2849,9 +3013,18 @@ fi
fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+
+fi
{ $as_echo "$as_me:$LINENO: result: $erlang_cv_ssl_runnable" >&5
$as_echo "$erlang_cv_ssl_runnable" >&6; }
+
+
{ $as_echo "$as_me:$LINENO: checking if Erlang/OTP crypto application is running fine" >&5
$as_echo_n "checking if Erlang/OTP crypto application is running fine... " >&6; }
if test "${erlang_cv_crypto_runnable+set}" = set; then
@@ -3683,7 +3856,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tsung $as_me 1.3.2, which was
+This file was extended by tsung $as_me 1.4.0a, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3733,7 +3906,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-tsung config.status 1.3.2
+tsung config.status 1.4.0a
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
View
@@ -33,6 +33,7 @@ dnl check for xmerl include path
AC_ERLANG_CHECK_LIB(xmerl)
AC_ERLANG_CHECK_LIB(ssl)
AC_ERLANG_CHECK_LIB(crypto)
+AC_ERLANG_CHECK_LIB(public_key)
dnl check if ssl is working
AC_CACHE_CHECK([if Erlang/OTP SSL application is running fine],
@@ -47,10 +48,25 @@ AC_CACHE_CHECK([if Erlang/OTP SSL application is running fine],
halt(0)])],
[erlang_cv_ssl_runnable=yes
ERLANG_APPLICATIONS="kernel,stdlib,ssl"],
- [ERLANG_APPLICATIONS="kernel,stdlib"
- AC_MSG_RESULT(WARNING: ssl application is not working properly !!!)])
+ [
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([], [dnl
+ application:start(crypto),
+ application:start(public_key),
+ case application:start(ssl) of
+ ok -> ok;
+ Err -> halt(1)
+ end,
+ halt(0)])],
+ [erlang_cv_ssl_runnable=yes
+ ERLANG_APPLICATIONS="kernel,stdlib,crypto,public_key,ssl"],
+ [ERLANG_APPLICATIONS="kernel,stdlib"
+ AC_MSG_RESULT(WARNING: ssl application is not working properly !!!)])
+ ])
])
+
+
dnl check if crypto is working
AC_CACHE_CHECK([if Erlang/OTP crypto application is running fine],
[erlang_cv_crypto_runnable],
View
@@ -1,3 +1,9 @@
+tsung (1.3.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Nicolas Niclausse <nicolas.niclausse@niclux.org> Wed, 17 Aug 2010 18:11:05 +0200
+
tsung (1.3.2-1) unstable; urgency=low
* New upstream release
Oops, something went wrong.

0 comments on commit 10d19f3

Please sign in to comment.