From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29061 invoked by alias); 7 Jul 2011 02:06:46 -0000 Received: (qmail 29053 invoked by uid 22791); 7 Jul 2011 02:06:45 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,TW_BJ,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-gy0-f169.google.com (HELO mail-gy0-f169.google.com) (209.85.160.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 07 Jul 2011 02:06:31 +0000 Received: by gyg13 with SMTP id 13so262608gyg.0 for ; Wed, 06 Jul 2011 19:06:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.236.66.1 with SMTP id g1mr247031yhd.304.1310004390358; Wed, 06 Jul 2011 19:06:30 -0700 (PDT) Received: by 10.236.95.167 with HTTP; Wed, 6 Jul 2011 19:06:30 -0700 (PDT) Date: Thu, 07 Jul 2011 02:07:00 -0000 Message-ID: Subject: [patch] python testsuite disappearing py-objfile-script-gdb.py From: Matt Rice To: gdb-patches@sourceware.org Content-Type: multipart/mixed; boundary=00248c6a650a576d7004a7712a6a X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-07/txt/msg00226.txt.bz2 --00248c6a650a576d7004a7712a6a Content-Type: text/plain; charset=ISO-8859-1 Content-length: 1030 this fixes that py-objfile-script-gdb.py disappears when running the testsuite with an in-tree build. had to rename the source file, since the auto-loading API is expecting the destination file to use the current name. I'd also tried special casing the remote_file host delete ${remote_python_file} but couldn't figure out some dejagnu equivalent of if is_remote || (!is_remote && ${srcdir} == ".") that special casing leaves it attempting to copy the file onto itself, but dejagnu seems to silently ignore that error. The file hasn't been modified since its initial commit, so we aren't losing a bunch of history, just the reference to the atomic commit/other files it was first added with. 2011-07-06 Matt Rice * gdb.python/py-objfile-script-gdb.py: Renamed to py-objfile-script-gdb.py.in. * gdb.python/py-objfile-script-gdb.py.in: Renamed from py-objfile-script-gdb.py. * gdb.python/py-objfile-script.exp: Update reference to py-objfile-script-gdb.py. --00248c6a650a576d7004a7712a6a Content-Type: application/octet-stream; name="foo.diff" Content-Disposition: attachment; filename="foo.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gpt1z6ax0 Content-length: 7203 ZGlmZiAtLWdpdCBhL2dkYi90ZXN0c3VpdGUvZ2RiLnB5dGhvbi9weS1vYmpm aWxlLXNjcmlwdC1nZGIucHkgYi9nZGIvdGVzdHN1aXRlL2dkYi5weXRob24v cHktb2JqZmlsZS1zY3JpcHQtZ2RiLnB5CmRlbGV0ZWQgZmlsZSBtb2RlIDEw MDY0NAppbmRleCBjNTRlOWVjLi4wMDAwMDAwCi0tLSBhL2dkYi90ZXN0c3Vp dGUvZ2RiLnB5dGhvbi9weS1vYmpmaWxlLXNjcmlwdC1nZGIucHkKKysrIC9k ZXYvbnVsbApAQCAtMSw2MyArMCwwIEBACi0jIENvcHlyaWdodCAoQykgMjAx MSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4KLQotIyBUaGlzIHBy b2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yIG1vZGlmeQotIyBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhl IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQot IyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lv biAzIG9mIHRoZSBMaWNlbnNlLCBvcgotIyAoYXQgeW91ciBvcHRpb24pIGFu eSBsYXRlciB2ZXJzaW9uLgotIwotIyBUaGlzIHByb2dyYW0gaXMgZGlzdHJp YnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKLSMg YnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGlt cGxpZWQgd2FycmFudHkgb2YKLSMgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQotIyBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgotIwot IyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZQotIyBhbG9uZyB3aXRoIHRoaXMgcHJv Z3JhbS4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5z ZXMvPi4KLQotIyBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgR0RCIHRlc3Rz dWl0ZS4KLQotaW1wb3J0IHJlCi0KLWNsYXNzIHBwX3NzOgotICAgIGRlZiBf X2luaXRfXyhzZWxmLCB2YWwpOgotICAgICAgICBzZWxmLnZhbCA9IHZhbAot Ci0gICAgZGVmIHRvX3N0cmluZyhzZWxmKToKLSAgICAgICAgcmV0dXJuICJh PTwiICsgc3RyKHNlbGYudmFsWyJhIl0pICsgIj4gYj08IiArIHN0cihzZWxm LnZhbFsiYiJdKSArICI+IgotCi1kZWYgbG9va3VwX2Z1bmN0aW9uICh2YWwp OgotICAgICJMb29rLXVwIGFuZCByZXR1cm4gYSBwcmV0dHktcHJpbnRlciB0 aGF0IGNhbiBwcmludCB2YWwuIgotCi0gICAgIyBHZXQgdGhlIHR5cGUuCi0g ICAgdHlwZSA9IHZhbC50eXBlCi0KLSAgICAjIElmIGl0IHBvaW50cyB0byBh IHJlZmVyZW5jZSwgZ2V0IHRoZSByZWZlcmVuY2UuCi0gICAgaWYgdHlwZS5j b2RlID09IGdkYi5UWVBFX0NPREVfUkVGOgotICAgICAgICB0eXBlID0gdHlw ZS50YXJnZXQgKCkKLQotICAgICMgR2V0IHRoZSB1bnF1YWxpZmllZCB0eXBl LCBzdHJpcHBlZCBvZiB0eXBlZGVmcy4KLSAgICB0eXBlID0gdHlwZS51bnF1 YWxpZmllZCAoKS5zdHJpcF90eXBlZGVmcyAoKQotCi0gICAgIyBHZXQgdGhl IHR5cGUgbmFtZS4gICAgCi0gICAgdHlwZW5hbWUgPSB0eXBlLnRhZwotCi0g ICAgaWYgdHlwZW5hbWUgPT0gTm9uZToKLSAgICAgICAgcmV0dXJuIE5vbmUK LQotICAgICMgSXRlcmF0ZSBvdmVyIGxvY2FsIGRpY3Rpb25hcnkgb2YgdHlw ZXMgdG8gZGV0ZXJtaW5lCi0gICAgIyBpZiBhIHByaW50ZXIgaXMgcmVnaXN0 ZXJlZCBmb3IgdGhhdCB0eXBlLiAgUmV0dXJuIGFuCi0gICAgIyBpbnN0YW50 aWF0aW9uIG9mIHRoZSBwcmludGVyIGlmIGZvdW5kLgotICAgIGZvciBmdW5j dGlvbiBpbiBwcmV0dHlfcHJpbnRlcnNfZGljdDoKLSAgICAgICAgaWYgZnVu Y3Rpb24ubWF0Y2ggKHR5cGVuYW1lKToKLSAgICAgICAgICAgIHJldHVybiBw cmV0dHlfcHJpbnRlcnNfZGljdFtmdW5jdGlvbl0gKHZhbCkKLSAgICAgICAg Ci0gICAgIyBDYW5ub3QgZmluZCBhIHByZXR0eSBwcmludGVyLiAgUmV0dXJu IE5vbmUuCi0KLSAgICByZXR1cm4gTm9uZQotCi1kZWYgcmVnaXN0ZXJfcHJl dHR5X3ByaW50ZXJzICgpOgotICAgIHByZXR0eV9wcmludGVyc19kaWN0W3Jl LmNvbXBpbGUgKCdec3MkJyldICA9IHBwX3NzCi0KLXByZXR0eV9wcmludGVy c19kaWN0ID0ge30KLQotcmVnaXN0ZXJfcHJldHR5X3ByaW50ZXJzICgpCi1n ZGIuY3VycmVudF9wcm9nc3BhY2UoKS5wcmV0dHlfcHJpbnRlcnMuYXBwZW5k IChsb29rdXBfZnVuY3Rpb24pCmRpZmYgLS1naXQgYS9nZGIvdGVzdHN1aXRl L2dkYi5weXRob24vcHktb2JqZmlsZS1zY3JpcHQtZ2RiLnB5LmluIGIvZ2Ri L3Rlc3RzdWl0ZS9nZGIucHl0aG9uL3B5LW9iamZpbGUtc2NyaXB0LWdkYi5w eS5pbgpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNTRl OWVjCi0tLSAvZGV2L251bGwKKysrIGIvZ2RiL3Rlc3RzdWl0ZS9nZGIucHl0 aG9uL3B5LW9iamZpbGUtc2NyaXB0LWdkYi5weS5pbgpAQCAtMCwwICsxLDYz IEBACisjIENvcHlyaWdodCAoQykgMjAxMSBGcmVlIFNvZnR3YXJlIEZvdW5k YXRpb24sIEluYy4KKworIyBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2Fy ZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorIyBp dCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorIyB0aGUgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAzIG9mIHRoZSBMaWNlbnNlLCBv cgorIyAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorIwor IyBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhh dCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyMgYnV0IFdJVEhPVVQgQU5ZIFdBUlJB TlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyMg TUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQ VVJQT1NFLiAgU2VlIHRoZQorIyBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxkIGhhdmUgcmVj ZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZQorIyBhbG9uZyB3aXRoIHRoaXMgcHJvZ3JhbS4gIElmIG5vdCwgc2VlIDxo dHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KKworIyBUaGlzIGZpbGUg aXMgcGFydCBvZiB0aGUgR0RCIHRlc3RzdWl0ZS4KKworaW1wb3J0IHJlCisK K2NsYXNzIHBwX3NzOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCB2YWwpOgor ICAgICAgICBzZWxmLnZhbCA9IHZhbAorCisgICAgZGVmIHRvX3N0cmluZyhz ZWxmKToKKyAgICAgICAgcmV0dXJuICJhPTwiICsgc3RyKHNlbGYudmFsWyJh Il0pICsgIj4gYj08IiArIHN0cihzZWxmLnZhbFsiYiJdKSArICI+IgorCitk ZWYgbG9va3VwX2Z1bmN0aW9uICh2YWwpOgorICAgICJMb29rLXVwIGFuZCBy ZXR1cm4gYSBwcmV0dHktcHJpbnRlciB0aGF0IGNhbiBwcmludCB2YWwuIgor CisgICAgIyBHZXQgdGhlIHR5cGUuCisgICAgdHlwZSA9IHZhbC50eXBlCisK KyAgICAjIElmIGl0IHBvaW50cyB0byBhIHJlZmVyZW5jZSwgZ2V0IHRoZSBy ZWZlcmVuY2UuCisgICAgaWYgdHlwZS5jb2RlID09IGdkYi5UWVBFX0NPREVf UkVGOgorICAgICAgICB0eXBlID0gdHlwZS50YXJnZXQgKCkKKworICAgICMg R2V0IHRoZSB1bnF1YWxpZmllZCB0eXBlLCBzdHJpcHBlZCBvZiB0eXBlZGVm cy4KKyAgICB0eXBlID0gdHlwZS51bnF1YWxpZmllZCAoKS5zdHJpcF90eXBl ZGVmcyAoKQorCisgICAgIyBHZXQgdGhlIHR5cGUgbmFtZS4gICAgCisgICAg dHlwZW5hbWUgPSB0eXBlLnRhZworCisgICAgaWYgdHlwZW5hbWUgPT0gTm9u ZToKKyAgICAgICAgcmV0dXJuIE5vbmUKKworICAgICMgSXRlcmF0ZSBvdmVy IGxvY2FsIGRpY3Rpb25hcnkgb2YgdHlwZXMgdG8gZGV0ZXJtaW5lCisgICAg IyBpZiBhIHByaW50ZXIgaXMgcmVnaXN0ZXJlZCBmb3IgdGhhdCB0eXBlLiAg UmV0dXJuIGFuCisgICAgIyBpbnN0YW50aWF0aW9uIG9mIHRoZSBwcmludGVy IGlmIGZvdW5kLgorICAgIGZvciBmdW5jdGlvbiBpbiBwcmV0dHlfcHJpbnRl cnNfZGljdDoKKyAgICAgICAgaWYgZnVuY3Rpb24ubWF0Y2ggKHR5cGVuYW1l KToKKyAgICAgICAgICAgIHJldHVybiBwcmV0dHlfcHJpbnRlcnNfZGljdFtm dW5jdGlvbl0gKHZhbCkKKyAgICAgICAgCisgICAgIyBDYW5ub3QgZmluZCBh IHByZXR0eSBwcmludGVyLiAgUmV0dXJuIE5vbmUuCisKKyAgICByZXR1cm4g Tm9uZQorCitkZWYgcmVnaXN0ZXJfcHJldHR5X3ByaW50ZXJzICgpOgorICAg IHByZXR0eV9wcmludGVyc19kaWN0W3JlLmNvbXBpbGUgKCdec3MkJyldICA9 IHBwX3NzCisKK3ByZXR0eV9wcmludGVyc19kaWN0ID0ge30KKworcmVnaXN0 ZXJfcHJldHR5X3ByaW50ZXJzICgpCitnZGIuY3VycmVudF9wcm9nc3BhY2Uo KS5wcmV0dHlfcHJpbnRlcnMuYXBwZW5kIChsb29rdXBfZnVuY3Rpb24pCmRp ZmYgLS1naXQgYS9nZGIvdGVzdHN1aXRlL2dkYi5weXRob24vcHktb2JqZmls ZS1zY3JpcHQuZXhwIGIvZ2RiL3Rlc3RzdWl0ZS9nZGIucHl0aG9uL3B5LW9i amZpbGUtc2NyaXB0LmV4cAppbmRleCBhODdiMjJhLi5lNzljMGI4IDEwMDY0 NAotLS0gYS9nZGIvdGVzdHN1aXRlL2dkYi5weXRob24vcHktb2JqZmlsZS1z Y3JpcHQuZXhwCisrKyBiL2dkYi90ZXN0c3VpdGUvZ2RiLnB5dGhvbi9weS1v YmpmaWxlLXNjcmlwdC5leHAKQEAgLTM4LDcgKzM4LDcgQEAgaWYgeyBbc2tp cF9weXRob25fdGVzdHNdIH0geyBjb250aW51ZSB9CiAjIE1ha2UgdGhlIC1n ZGIucHkgc2NyaXB0IGF2YWlsYWJsZSB0byBnZGIsIGl0IGlzIGF1dG9tYWdp Y2FsbHkgbG9hZGVkIGJ5IGdkYi4KICMgQ2FyZSBpcyB0YWtlbiB0byBwdXQg aXQgaW4gdGhlIHNhbWUgZGlyZWN0b3J5IGFzIHRoZSBiaW5hcnkgc28gdGhh dAogIyBnZGIgd2lsbCBmaW5kIGl0Lgotc2V0IHJlbW90ZV9weXRob25fZmls ZSBbcmVtb3RlX2Rvd25sb2FkIGhvc3QgJHtzcmNkaXJ9LyR7c3ViZGlyfS8k e3Rlc3RmaWxlfS1nZGIucHkgJHtzdWJkaXJ9LyR7dGVzdGZpbGV9LWdkYi5w eV0KK3NldCByZW1vdGVfcHl0aG9uX2ZpbGUgW3JlbW90ZV9kb3dubG9hZCBo b3N0ICR7c3JjZGlyfS8ke3N1YmRpcn0vJHt0ZXN0ZmlsZX0tZ2RiLnB5Lmlu ICR7c3ViZGlyfS8ke3Rlc3RmaWxlfS1nZGIucHldCiAKIGdkYl9yZWluaXRp YWxpemVfZGlyICRzcmNkaXIvJHN1YmRpcgogZ2RiX2xvYWQgJHtiaW5maWxl fQo= --00248c6a650a576d7004a7712a6a--