autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) has detected an intermittent
failing test in
the current master tree.
The autobuild log of the failure is available here:
https://git.samba.org/autobuild.flakey.sn-devel-144/2018-09-08-0807/flakey.log
The failure seems to be in the "samba" suite, whose build logs are available
here:
https://git.samba.org/autobuild.flakey.sn-devel-144/2018-09-08-0807/samba.stderr
https://git.samba.org/autobuild.flakey.sn-devel-144/2018-09-08-0807/samba.stdout
The top commit at the time of the failure was:
commit b1bf9c5d850457dce1d5a38bdb800f0280c54d68
Author: Justin Stephenson
Date: Fri Aug 31 15:28:36 2018 -0400
spoolss-iremotewinspool-tests: Use more recent client OS version
Set torture test client info build, major, and minor
version numbers to Windows 7 and Windows Server 2008 R2 values
buildnum: 7007
major: 6
minor: 1
Build number taken from
[MS-RPRN] <168> Section 2.2.3.10.1
Major/Minor numbers taken from
https://docs.microsoft.com/en-us/windows/desktop/sysinfo/operating-system-version
Signed-off-by: Justin Stephenson
Reviewed-by: Jeremy Allison
Reviewed-by: Andreas Schneider
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Sat Sep 8 04:35:56 CEST 2018 on sn-devel-144
and the last 50 lines of the stdout log were:
[783(4780)/848 at 1h20m46s] samba4.deletetest.python(ad_dc_ntvfs)(ad_dc_ntvfs)
[784(4784)/848 at 1h20m48s]
samba4.blackbox.spn.py(ad_dc_ntvfs:local)(ad_dc_ntvfs:local)
[785(4795)/848 at 1h20m52s] samba4.rpc.samr.large-dc.one(vampire_dc)
[786(4798)/848 at 1h21m1s] samba4.rpc.samr.large-dc.two(vampire_dc)
[787(4801)/848 at 1h21m9s] samba4.rpc.echo(rodc)
[788(4811)/848 at 1h21m13s] samba4.rpc.echo(rodc:local)
[789(4821)/848 at 1h21m17s] samba4.rpc.echo.testallowed(rodc:local)
[790(4831)/848 at 1h21m20s] samba4.rpc.echo.testdenied(rodc:local)
[791(4841)/848 at 1h21m24s] samba4.blackbox.smbclient(rodc:local)(rodc:local)
[792(4843)/848 at 1h21m24s] samba.tests.samba_tool.rodc(rodc:local)
[793(4852)/848 at 1h21m55s] samba.blackbox.rpcclient_samlogon(rodc:local)
[794(4856)/848 at 1h21m55s]
samba.blackbox.rpcclient_samlogon_testallowed(rodc:local)
[795(4860)/848 at 1h21m56s]
samba.blackbox.rpcclient_samlogon_testdenied(rodc:local)
[796(4864)/848 at 1h21m57s]
samba4.drs.ridalloc_exop.python(vampire_dc)(vampire_dc)
[797(4875)/848 at 1h27m15s]
samba4.drs.samba_tool_drs.python(vampire_dc)(vampire_dc:local)
[798(4889)/848 at 1h31m4s]
samba4.drs.samba_tool_drs_showrepl.python(vampire_dc)(vampire_dc:local)
[799(4893)/848 at 1h31m12s]
samba4.drs.replica_sync.python(vampire_dc)(vampire_dc:local)
[800(4909)/848 at 1h34m57s]
samba4.drs.delete_object.python(vampire_dc)(vampire_dc)
[801(4911)/848 at 1h35m6s] samba4.drs.fsmo.python(vampire_dc)(vampire_dc)
[802(4916)/848 at 1h35m24s] samba4.drs.repl_move.python(vampire_dc)(vampire_dc)
[803(4937)/848 at 1h37m19s] samba4.drs.getnc_exop.python(vampire_dc)(vampire_dc)
[804(4949)/848 at 1h37m40s]
samba4.drs.getnc_unpriv.python(vampire_dc)(vampire_dc)
[805(4953)/848 at 1h37m46s]
samba4.drs.linked_attributes_drs.python(vampire_dc)(vampire_dc)
[806(4956)/848 at 1h37m49s]
samba4.drs.link_conflicts.python(vampire_dc)(vampire_dc)
[807(4968)/848 at 1h43m59s]
samba4.drs.samba_tool_drs.python(promoted_dc)(promoted_dc:local)
UNEXPECTED(error):
samba4.drs.samba_tool_drs.python(promoted_dc).samba_tool_drs.SambaToolDrsTests.test_samba_tool_kcc(promoted_dc:local)
REASON: Exception: Exception: Traceback (most recent call last):
File
"/memdisk/autobuild/fl/b845265/samba/source4/torture/drs/python/samba_tool_drs.py",
line 81, in test_samba_tool_kcc
self.cmdline_creds))
File "bin/python/samba/tests/__init__.py", line 400, in check_output
raise BlackboxProcessError(retcode, line, stdoutdata, stderrdata)
BlackboxProcessError: Command
'/memdisk/autobuild/fl/b845265/samba/bin/samba-tool drs kcc localdc
-USAMBADOMAIN/Administrator%locDCpass1'; exit status 255; stdout: ''; stderr:
'ERROR(runtime): DsExecuteKCC failed - (3221225653, '{Device Timeout} The
specified I/O operation on %hs was not completed before the time-out period
expired.')
'
FAILED (0 failures, 1 errors and 0 unexpected successes in 0 testsuites)
A summary with detailed information can be found in:
./bin/ab/summary
TOP 10 slowest tests
samba4.ldap.rodc_rwdc.python(rodc)(rodc:local) -> 453
samba4.drs.link_conflicts.python(vampire_dc)(vampire_dc) -> 370
samba4.drs.ridalloc_exop.python(vampire_dc)(vampire_dc) -> 318
samba4.ldap.confidential_attr.python(ad_dc_ntvfs)(ad_dc_ntvfs) -> 308
samba4.ldap.vlv.python(ad_dc_ntvfs)(ad_dc_ntvfs) -> 233
samba4.drs.samba_tool_drs.python(vampire_dc)(vampire_dc:local) -> 229
samba4.rpc.samr.passwords.lockout on ncacn_np with (ad_dc_ntvfs) -> 226
samba4.drs.replica_sync.python(vampire_dc)(vampire_dc:local) -> 225
samba4.rpc.samr.passwords.pwdlastset on ncacn_np with (ad_dc_ntvfs) -> 200
samba4.l
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b1bf9c5 spoolss-iremotewinspool-tests: Use more recent client OS version via 2b97074 iremotewinspool-tests: Add client os build number validation test via 4fc0602 iremotewinspool-tests: Allow modification of OS client version information via b8279f6 s3-rpcclient: Use spoolss_init_spoolss_UserLevel1 in winspool cmds via 1da7708 s3-rpc_client: Advertise Windows 7 client info via a2aa7d6 s3-spoolss: Make spoolss client os_major,os_minor and os_build configurable. from 70169d4 wafsamba: Fix 'make -j' https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b1bf9c5d850457dce1d5a38bdb800f0280c54d68 Author: Justin Stephenson Date: Fri Aug 31 15:28:36 2018 -0400 spoolss-iremotewinspool-tests: Use more recent client OS version Set torture test client info build, major, and minor version numbers to Windows 7 and Windows Server 2008 R2 values buildnum: 7007 major: 6 minor: 1 Build number taken from [MS-RPRN] <168> Section 2.2.3.10.1 Major/Minor numbers taken from https://docs.microsoft.com/en-us/windows/desktop/sysinfo/operating-system-version Signed-off-by: Justin Stephenson Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Sep 8 04:35:56 CEST 2018 on sn-devel-144 commit 2b9707413f541231ac8e14f4bfba24f66253c082 Author: Justin Stephenson Date: Wed Aug 22 13:23:18 2018 -0400 iremotewinspool-tests: Add client os build number validation test Add test validating the AsyncOpenPrinter result based on the provided client info build number Signed-off-by: Justin Stephenson Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider commit 4fc0602d975277287ef5257929dff49d21b05adc Author: Justin Stephenson Date: Wed Aug 15 11:10:21 2018 -0400 iremotewinspool-tests: Allow modification of OS client version information Add test_get_client_info() function to set and, or modify the client OS version values advertised in the iremotewinspool torture tests. The OS build numbers are used from the table in: [MS-RPRN] <168> Section 2.2.3.10.1 Signed-off-by: Justin Stephenson Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider commit b8279f6525b806d8f91aa8ce016bd528fff917f4 Author: Günther Deschner Date: Fri Aug 31 18:22:04 2018 +0200 s3-rpcclient: Use spoolss_init_spoolss_UserLevel1 in winspool cmds Use spoolss initialization function to set client version information for iremotewinspool printer operations Signed-off-by: Guenther Deschner Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider commit 1da770848753c172d0c790911b97dbe9c3ccee06 Author: Justin Stephenson Date: Fri Aug 31 13:28:58 2018 -0400 s3-rpc_client: Advertise Windows 7 client info Client printing operations currently fail against Windows Server 2016 with Access Denied if a client os build number lower than 6000 is advertised. Increase the default build number, major, and minor versions to values associated with client OS versoins Windows 7 and Windows Server 2008 R2. The build number value specifically needs to be increased to allow these operations to succeed. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13597 Signed-off-by: Justin Stephenson Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider commit a2aa7d6d65351a887b438d57ff509aaa05a28251 Author: Günther Deschner Date: Fri Aug 31 17:36:19 2018 +0200 s3-spoolss: Make spoolss client os_major,os_minor and os_build configurable. Similar to spoolss server options, make the client advertised OS version values configurable to allow overriding the defaults provided to the print server. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13597 Signed-off-by: Guenther Deschner Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider --- Summary of changes: docs-xml/smbdotconf/printing/spoolssosversion.xml | 39 ++ source3/rpc_client/cli_spoolss.c | 29 ++--- source3/rpc_client/init_spoolss.c | 31 + source3/rpc_client/init_spoolss.h | 3 + source3/rpcclient/cmd_iremotewinspool.c | 16 ++- source4/torture/rpc/iremotewinspool.c | 151 -- source4/torture/rpc/spoolss_access.c | 7 +- 7 files changed, 236 insertions(+), 40 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/printing/spoolssosversion.xml b/docs-xml/smbdotconf/printing/spoolssosversion.xml index 0ef4489..1b57b
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 70169d4 wafsamba: Fix 'make -j' via b487979 ctdb-tests: Fix CTDB -O3 --picky-developer build on CentOS 7 via 95682e2 dbwrap: Remove a pointless "return;" via a5f9b33 vfs_fruit: fix an uninitialized variable error via 6be25d5 smbd: Simplify logic in remove_stale_share_mode_entries via 6a76a31 smbd: Simplify share_mode_stale_pid via 45a2e3e smbd: Simplify lease_match() a bit via 9108572 smbd: Simplify logic in fsp_lease_update via 6a78201 smbd: Simplify logic in smb2_lease_break_send via c228134 smbd: Factor out file_has_read_oplocks() via b88290c s3:lib: Rename server_contexts to global_contexts via a7c19bc s3:lib/server_contexts: Rename variables via cc76aae s3: Rename server_messaging_context() to global_messaging_context() via ae7db3e s3: Rename server_event_context() to global_event_context() via 94852e3 examples: Fix the smb2mount build via 20ed139 s3:smbget: Use cmdline_messaging_context via de040ea s3:smbcontrol: Use cmdline_messaging_context via 7eeff96 s3:dbwrap_tool: Use cmdline_messaging_context via 095123d s3:eventlogadm: Use cmdline_messaging_context via 9ed6174 s3: ntlm_auth: Use cmdline_messaging_context via cab8f27 s3:sharesec: Use cmdline_messaging_context via ea7a4ff s3:testparm: Use cmdline_messaging_context via 4661537 s3:pdbedit: Use cmdline_messaging_context via f56496b s3:messaging: remove unused messaging_init_client() via f2b659e s3:net: Use cmdline_messaging_context via dd3ae2f rpcclient: Use cmdline_messaging_context via d7fa381 s3:smbstatus: Use cmdline_messaging_context via 29fd2c2 s3:smbpasswd: Use cmdline_messaging_context via 3ecb9ed test:doc: Skip 'clustering=yes' via 2c63ce9 s3:popt_common: use cmdline_messaging_context() in popt_common_credentials_callback() via 10e1a6e selftest: pass configfile to pdbedit via 3aca3f2 s3:loadparm: reinit_globals in lp_load_with_registry_shares() via 8c3b62e s3:lib: Introduce cmdline context wrapper via b7464fd s3:lib: Move popt_common_credentials to separate file via dff1028 s3/lib:popt_common: Move setup_logging to common callback via d920a72 s3:lib/server_contexts: make server_event_ctx and server_msg_ctx static from 4847daf wafsamba/samba_waf18: redefine flex function https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 70169d4789fe8b2ee4efe5e88eeaa80e1a641b32 Author: Andreas Schneider Date: Thu Sep 6 12:40:10 2018 +0200 wafsamba: Fix 'make -j' Currently only 'make -j' enables parallel builds and e.g. 'make -j4' results in no parallel compile jobs at all. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13606 Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Fri Sep 7 20:24:46 CEST 2018 on sn-devel-144 commit b487979f89cd4dffabfb68b60955ff65de94b02f Author: Martin Schwenke Date: Thu Sep 6 16:06:40 2018 +1000 ctdb-tests: Fix CTDB -O3 --picky-developer build on CentOS 7 gcc 4.8.5 complains: [319/381] Compiling ctdb/tests/src/system_socket_test.c ../tests/src/system_socket_test.c: In function ‘test_tcp’: ../tests/src/system_socket_test.c:196:20: error: ‘rst_out’ may be used uninitialized in this function [-Werror=maybe-uninitialized] assert((rst != 0) == (rst_out != 0)); ^ cc1: all warnings being treated as errors Signed-off-by: Martin Schwenke Reviewed-by: Andreas Schneider commit 95682e2fdd55b390170ec4ccd6ad679738e97c20 Author: Volker Lendecke Date: Fri Aug 31 06:09:48 2018 +0200 dbwrap: Remove a pointless "return;" Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit a5f9b33cb47d7cb91a201e058b18bc5d45c397ef Author: Volker Lendecke Date: Wed Sep 5 11:31:10 2018 +0200 vfs_fruit: fix an uninitialized variable error clang does not recognize "smb_panic" as an "exit()" equivalent Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 6be25d5683d5fbfddab4f22c4dbe6299969d1978 Author: Volker Lendecke Date: Mon Jul 30 13:21:26 2018 +0200 smbd: Simplify logic in remove_stale_share_mode_entries To me, an early "continue" is easier to follow than a "else". Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme commit 6a76a317793d6ae8fa1ce05f4faacbd0978fd5cb Author: Volker Lendecke Date: Mon Jul 30 13:03:17 2018 +0200 smbd: Simplify share_mode_stale_pid This loop does not need to count valid share modes. A single valid one is sufficient for keeping the delete token around Sig
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: https://git.samba.org/autobuild.flakey.sn-devel-144/2018-09-07-1833/flakey.log The failure seems to be in the "samba-py3" suite, whose build logs are available here: https://git.samba.org/autobuild.flakey.sn-devel-144/2018-09-07-1833/samba-py3.stderr https://git.samba.org/autobuild.flakey.sn-devel-144/2018-09-07-1833/samba-py3.stdout The top commit at the time of the failure was: commit 4847daf0b762db205812347c8e31edd3a3ef5039 Author: Alexander Bokovoy Date: Thu Sep 6 09:36:18 2018 +0300 wafsamba/samba_waf18: redefine flex function There is a bug in waf: flex routine adjusts its inputs against the task's current working directory but assumes it is being called from within the build variant directory. For Samba this means we adjust one level up than the actual work directory we use to run (bin/ vs bin/default) and flex doesn't find the source files. Fix the issue by creating a local override of flex definition that utilizes the same workd directory for both path adjustment and running the flex itself. Signed-off-by: Alexander Bokovoy Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Sep 7 15:45:36 CEST 2018 on sn-devel-144 and the last 50 lines of the stdout log were: [25(181)/36 at 4m54s] samba.tests.emulate.traffic_packet.python3(ad_dc_ntvfs) [26(270)/36 at 5m46s] samba.tests.blackbox.traffic_replay.python3(ad_dc_ntvfs) [27(276)/36 at 5m56s] samba.tests.blackbox.traffic_learner.python3(ad_dc_ntvfs) [28(278)/36 at 5m57s] samba.tests.blackbox.traffic_summary.python3(ad_dc_ntvfs) [29(278)/36 at 5m57s] samba.tests.blackbox.smbcontrol.python3(ad_dc_ntvfs:local) [30(280)/36 at 5m59s] samba.tests.blackbox.smbcontrol.python3(promoted_dc:local) [31(282)/36 at 6m0s] samba4.schemaInfo.python(ad_dc_ntvfs).python3(ad_dc_ntvfs) [32(284)/36 at 6m3s] samba.tests.dsdb_schema_attributes.python3(ad_dc_ntvfs:local) [33(290)/36 at 6m17s] samba4.drs.replica_sync_rodc.python(rodc).python3(rodc:local) [34(292)/36 at 6m58s] samba4.tombstone_reanimation.python.python3(ad_dc_ntvfs) [35(304)/36 at 7m6s] samba.tests.samba_tool.visualize_drs.python3(vampire_dc) [36(315)/36 at 8m28s] samba.tests.samba_tool.visualize_drs.python3(promoted_dc) Attempting to contact ldap://promotedvdc.samba.example.com (CN=PROMOTEDVDC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com) Attempting to contact ldap://localvampiredc.samba.example.com (CN=LOCALVAMPIREDC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com) found extra DSAs: CN=RODC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com missing DSAs (known locally, not by CN=LOCALVAMPIREDC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com): Attempting to contact ldap://localdc.samba.example.com (CN=LOCALDC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com) found extra DSAs: CN=RODC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com missing DSAs (known locally, not by CN=LOCALDC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com): UNEXPECTED(failure): samba.tests.samba_tool.visualize_drs.python3.samba.tests.samba_tool.visualize_drs.SambaToolVisualizeDrsTest.test_reps_remote(promoted_dc) REASON: Exception: Exception: Traceback (most recent call last): File "/memdisk/autobuild/fl/b1503231/samba-py3/bin/python/samba/tests/samba_tool/visualize_drs.py", line 466, in test_reps_remote self.assertCmdSuccess(result, out, err) File "/memdisk/autobuild/fl/b1503231/samba-py3/bin/python/samba/tests/samba_tool/base.py", line 109, in assertCmdSuccess exit, out, err, msg)) AssertionError: -1 is not None : exit[-1] stdout[] stderr[ERROR(): uncaught exception - 'c71a9ee2-45cd-4a4b-ae12-56749f409380' File "/memdisk/autobuild/fl/b1503231/samba-py3/bin/python/samba/netcmd/__init__.py", line 183, in _run return self.run(*args, **kwargs) File "/memdisk/autobuild/fl/b1503231/samba-py3/bin/python/samba/netcmd/visualize.py", line 339, in run (guid_to_dnstr[str(r.source_dsa_obj_guid)], ]: FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites) A summary with detailed information can be found in: ./bin/ab/summary TOP 10 slowest tests samba.tests.samba_tool.visualize_drs.python3(vampire_dc) -> 82 samba.tests.samba_tool.user.python3(ad_dc_ntvfs:local) -> 64 samba.tests.emulate.traffic_packet.python3(ad_dc_ntvfs) -> 52 samba.tests.samba_tool.user_wdigest.python3(ad_dc_ntvfs:local) -> 40 samba.tests.samba_tool.computer.python3(ad_dc_ntvfs:local) -> 19 samba.tests.samba
Re: [SCM] Samba Shared Repository - branch master updated
On pe, 07 syys 2018, Andrew Bartlett wrote: > The branch, master has been updated >via 4847daf wafsamba/samba_waf18: redefine flex function >via 364077d lib/replace/wscript: fix detection of a fallthrough > attribute for clang >via 311e1eb wafsamba/samba_autoconf: when setting undefined result, > use empty tuple >via 193fdbf s3/wscript: fix flex detection >via e761271 s3/wscript: fix bison detection > from 4a63ab9 s4/selftest/tests: Enabled samba.tests.samba_tool.computer > > https://git.samba.org/?p=samba.git;a=shortlog;h=master While Andrew pushed the current patch set, Metze pointed out that it didn't solve the issue with CONFIG_SET() still reporting undefined defines are set if they were stored in the cache as '0'. Attached patch should fix the issue. On FreeBSD 11.2 I now have: $ egrep '(HAVE_BSD_STRTOLL|INCOHERENT_MMAP|WORKING_STRPTIME)' bin/default/include/config.h bin/c4che/default_cache.py bin/default/include/config.h:#define HAVE_BSD_STRTOLL 1 bin/default/include/config.h:/* #undef HAVE_WORKING_STRPTIME */ bin/default/include/config.h:/* #undef HAVE_INCOHERENT_MMAP */ bin/c4che/default_cache.py:HAVE_BSD_STRTOLL = 1 bin/c4che/default_cache.py:HAVE_INCOHERENT_MMAP = () bin/c4che/default_cache.py:HAVE_WORKING_STRPTIME = () -- / Alexander Bokovoy >From 92f2b9b2bac513412169de959285c35a40ea9d07 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 7 Sep 2018 14:34:48 + Subject: [PATCH] buildtools/wafsamba: undefine a define for a failed test unless asked to keep it If conf.CHECK_CODE() is called without `always=True` and the test has failed, undefine the define already set to '0' by conf.check_code(). This restores expectations that undefined symbols are not considered to be set by CONFIG_SET() method. Signed-off-by: Alexander Bokovoy --- buildtools/wafsamba/samba_autoconf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 6b940e53c00..ced824d593d 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -447,6 +447,8 @@ def CHECK_CODE(conf, code, define, except Exception: if always: conf.DEFINE(define, 0) +else: +conf.undefine(define) conf.COMPOUND_END(False) if mandatory: raise -- 2.18.0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4847daf wafsamba/samba_waf18: redefine flex function
via 364077d lib/replace/wscript: fix detection of a fallthrough
attribute for clang
via 311e1eb wafsamba/samba_autoconf: when setting undefined result, use
empty tuple
via 193fdbf s3/wscript: fix flex detection
via e761271 s3/wscript: fix bison detection
from 4a63ab9 s4/selftest/tests: Enabled samba.tests.samba_tool.computer
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4847daf0b762db205812347c8e31edd3a3ef5039
Author: Alexander Bokovoy
Date: Thu Sep 6 09:36:18 2018 +0300
wafsamba/samba_waf18: redefine flex function
There is a bug in waf: flex routine adjusts its inputs against
the task's current working directory but assumes it is being called from
within the build variant directory.
For Samba this means we adjust one level up than the actual work
directory we use to run (bin/ vs bin/default) and flex doesn't find the
source files.
Fix the issue by creating a local override of flex definition that
utilizes the same workd directory for both path adjustment and running
the flex itself.
Signed-off-by: Alexander Bokovoy
Reviewed-by: Andrew Bartlett
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Fri Sep 7 15:45:36 CEST 2018 on sn-devel-144
commit 364077d262012af0346afad6d9b9c3999054563f
Author: Alexander Bokovoy
Date: Thu Sep 6 09:50:58 2018 +
lib/replace/wscript: fix detection of a fallthrough attribute for clang
clang issues a warning but otherwise allows our test to be compiled and
linked. We consider this case a successful pass for a fallthrough
attribute detection while it is an error.
Turn missing declaration warning into an error so that we actually do
not define fallthrough attribute support in case it doesn't really work.
Fixes FreeBSD 11.2 with clang.
Signed-off-by: Alexander Bokovoy
Reviewed-by: Andrew Bartlett
commit 311e1eb67306d6a639ce80b94a16ea2ef19592f0
Author: Alexander Bokovoy
Date: Thu Sep 6 07:51:00 2018 +
wafsamba/samba_autoconf: when setting undefined result, use empty tuple
A difference between waf 1.x and 2.x is that we gained 0 as an undefined
variable in the cache file. This does not allow to differentiate unset
and set to 0 defines.
Force to use empty tuple () to signify unset defines.
Also, fix handling of extra cflags in case of 'strict=True': if
extra_cflags were not defined, we'd append None to the cflags list and
it confuses conf.check() later. 'None' is added to the command line of a
tool executed by the conf.check() which, depending on a tool, may be
treated as an error and cause wrong test result.
Signed-off-by: Alexander Bokovoy
Reviewed-by: Andrew Bartlett
commit 193fdbf181ad7848cabf56db9780571aeb91aa3a
Author: Ralph Boehme
Date: Wed Sep 5 13:47:17 2018 +0200
s3/wscript: fix flex detection
Signed-off-by: Ralph Boehme
Reviewed-by: Andrew Bartlett
commit e7612710d1e94d18f80649deb17e6defae9a5b23
Author: Ralph Boehme
Date: Wed Sep 5 13:46:37 2018 +0200
s3/wscript: fix bison detection
Signed-off-by: Ralph Boehme
Reviewed-by: Andrew Bartlett
---
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 11 --
buildtools/wafsamba/samba_waf18.py| 41 +--
lib/replace/wscript | 1 +
source3/wscript | 4 ++--
4 files changed, 46 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index 02fbeec..6b940e5 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -402,7 +402,8 @@ def CHECK_CODE(conf, code, define,
extra_cflags = "-Werror"
elif conf.env["CC_NAME"] == "xlc":
extra_cflags = "-qhalt=w"
-cflags.append(extra_cflags)
+if extra_cflags:
+cflags.append(extra_cflags)
if local_include:
cflags.append('-I%s' % conf.path.abspath())
@@ -451,7 +452,13 @@ def CHECK_CODE(conf, code, define,
raise
return False
else:
-# success
+# Success is indicated by ret but we should unset
+# defines set by WAF's c_config.check() because it
+# defines it to int(ret) and we want to undefine it
+if not ret:
+conf.undefine(define)
+conf.COMPOUND_END(False)
+return False
if not define_ret:
conf.DEFINE(define, 1)
conf.COMPOUND_END(True)
diff --git a/buildtools/wafsamba/samb
