* Patch rebased from 3.2.5 to 3.4.0 beta1
This commit is contained in:
parent
28fd0943c0
commit
be24a5ee62
@ -1,9 +1,9 @@
|
|||||||
diff -ruN syslog-ng-3.2.5/tests/functional/control.py syslog-ng-3.2.5-modified/tests/functional/control.py
|
diff -ruN syslog-ng-3.4.0beta1/tests/functional/control.py syslog-ng-3.4.0beta1-modified/tests/functional/control.py
|
||||||
--- syslog-ng-3.2.5/tests/functional/control.py 2010-11-20 08:47:33.000000000 +0000
|
--- syslog-ng-3.4.0beta1/tests/functional/control.py 2012-11-01 08:29:14.000000000 +0000
|
||||||
+++ syslog-ng-3.2.5-modified/tests/functional/control.py 2012-01-15 04:56:14.948239475 +0000
|
+++ syslog-ng-3.4.0beta1-modified/tests/functional/control.py 2012-12-20 17:48:08.236401614 +0000
|
||||||
@@ -35,7 +35,7 @@
|
@@ -35,7 +35,7 @@
|
||||||
for (root, dirs, files) in os.walk(os.path.abspath(os.path.join(os.environ['top_builddir'], 'modules'))):
|
for (root, dirs, files) in os.walk(os.path.abspath(os.path.join(os.environ['top_builddir'], 'modules'))):
|
||||||
module_path = ':'.join(map(lambda x: root + '/' + x, dirs))
|
module_path = ':'.join(map(lambda x: root + '/' + x + '/.libs', dirs))
|
||||||
break
|
break
|
||||||
- rc = os.execl('../../syslog-ng/syslog-ng', '../../syslog-ng/syslog-ng', '-f', 'test.conf', '--fd-limit', '1024', '-F', verbose_opt, '-p', 'syslog-ng.pid', '-R', 'syslog-ng.persist', '--no-caps', '--enable-core', '--seed', '--module-path', module_path)
|
- rc = os.execl('../../syslog-ng/syslog-ng', '../../syslog-ng/syslog-ng', '-f', 'test.conf', '--fd-limit', '1024', '-F', verbose_opt, '-p', 'syslog-ng.pid', '-R', 'syslog-ng.persist', '--no-caps', '--enable-core', '--seed', '--module-path', module_path)
|
||||||
+ rc = os.execl('../../syslog-ng/syslog-ng', '../../syslog-ng/syslog-ng', '-f', 'test.conf', '--fd-limit', '1024', '-F', verbose_opt, '-p', '/var/tmp/syslog-ng.pid', '-c', '/var/tmp/syslog-ng.ctl', '-R', '/var/tmp/syslog-ng.persist', '--no-caps', '--enable-core', '--seed', '--module-path', module_path)
|
+ rc = os.execl('../../syslog-ng/syslog-ng', '../../syslog-ng/syslog-ng', '-f', 'test.conf', '--fd-limit', '1024', '-F', verbose_opt, '-p', '/var/tmp/syslog-ng.pid', '-c', '/var/tmp/syslog-ng.ctl', '-R', '/var/tmp/syslog-ng.persist', '--no-caps', '--enable-core', '--seed', '--module-path', module_path)
|
Loading…
Reference in New Issue
Block a user