Bug #10225

wsdiff broken after 9979

Added by Andy Fiddaman 9 days ago. Updated 4 days ago.

Status:ClosedStart date:2019-01-12
Priority:UrgentDue date:
Assignee:Andy Fiddaman% Done:

100%

Category:tools - gate/build tools
Target version:-
Difficulty:Medium Tags:

Description

9979 made changes to wsdiff to support running under both python2 and python3, but part of the patch was missing in the wad sent for RTI.


Related issues

Related to illumos gate - Feature #9979: Support python3 for in-gate tools Closed 2018-11-14

History

#1 Updated by Andy Fiddaman 9 days ago

  • Related to Feature #9979: Support python3 for in-gate tools added

#3 Updated by Andy Fiddaman 9 days ago

Testing:

% ls test
JPool.jar             global.db             nonglobal.db
SmfManageAudit.html   libssl.a              zfs*
dtrace.jar            llib-lintl.ln         zpool*
% gdiff test test.new
diff test/SmfManageAudit.html test.new/SmfManageAudit.html
27c27
< <!-- Generated by javadoc fjdskfsd jhfjdghkfjsdghfjdsgh jsdfghsdgjhfs -->
---
> <!-- Generated by javadoc xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
% wsdiff test test.new
% python3 =wsdiff test test.new
%
% cp test.new/zpool test.new/zfs
% cp test.new/global.db test.new/nonglobal.db
% cp /usr/lib/libfl.a test.new/libssl.a
% cp proto/root_i386/usr/ccs/lib/llib-lmenu.ln test.new/llib-lintl.ln
% rm test.new/zpool
% cp test.new/zfs test.new/pstack
% wsdiff -V -r out2 -s test test.new

New objects found:
pstack

Objects removed:
zpool

Changed objects:
test/libssl.a
test/llib-lintl.ln
test/nonglobal.db
test/zfs

% python3 =wsdiff -V -r out3 -s test test.new

New objects found:
pstack

Objects removed:
zpool

Changed objects:
test/libssl.a
test/llib-lintl.ln
test/nonglobal.db
test/zfs
% grep detected out2
NOTE: Lint Library difference detected.
NOTE: ELF Object Archive difference detected.
NOTE: Sqlite Database difference detected.
NOTE: ELF .text difference detected.
NOTE: ELF .data difference detected.
NOTE: ELF .rodata difference detected.
NOTE: ELF .SUNW_versym difference detected.
NOTE: ELF .dynstr difference detected.
NOTE: ELF .rel.plt difference detected.
NOTE: ELF .dynsym difference detected.
NOTE: ELF .SUNW_version difference detected.
NOTE: ELF .SUNW_ldynsym difference detected.
NOTE: ELF .SUNW_reloc difference detected.
NOTE: ELF .init difference detected.
NOTE: ELF .got difference detected.
NOTE: ELF .SUNW_syminfo difference detected.
NOTE: ELF .symtab difference detected.
NOTE: ELF .eh_frame_hdr difference detected.
NOTE: ELF .fini difference detected.
NOTE: ELF .hash difference detected.
NOTE: ELF .SUNW_dynsymsort difference detected.
NOTE: ELF .dynamic difference detected.
NOTE: ELF .strtab difference detected.
NOTE: ELF .symtab difference detected.

5c5
<        [1]  0x00000000 0x00000000  FILE LOCL  D    0 ABS            zfs
---
>        [1]  0x00000000 0x00000000  FILE LOCL  D    0 ABS            zpool
...
% grep 'added to' out2
/libmain.o added to test/libssl.a
% grep 'INSERT INTO' out3
< INSERT INTO id_tbl VALUES('SI',113);
< INSERT INTO id_tbl VALUES('PG',829);
< INSERT INTO id_tbl VALUES('GEN',799);
> INSERT INTO id_tbl VALUES('SI',117);
> INSERT INTO id_tbl VALUES('PG',851);
> INSERT INTO id_tbl VALUES('GEN',820);
...
% banner test >> test.new/*html
...
NOTE: HTML difference detected.

44a45,52
>
>   #####  ######   ####    #####
>     #    #       #          #
>     #    #####    ####      #
>     #    #            #     #
>     #    #       #    #     #
>     #    ######   ####      #
>

% cd test.new; jar xvf dtrace.jar
% cp org/opensolaris/os/dtrace/ConsumerEvent.class org/opensolaris/os/dtrace/Drop.class
% rm org/opensolaris/os/dtrace/Utility.class
% mv  org/opensolaris/os/dtrace/ExitRecord.class org/opensolaris/os/dtrace/xxxx.class
% jar cvf dtrace.jar org
% rm -rf org
test/dtrace.jar
NOTE: Java Archive difference detected.

/org/opensolaris/os/dtrace/xxxx.class added to test/dtrace.jar

#4 Updated by Andy Fiddaman 4 days ago

  • Status changed from New to Pending RTI

#5 Updated by Electric Monk 4 days ago

  • Status changed from Pending RTI to Closed

git commit c8cc685318cb78c62f1ff07bc561b26d65780aa3

commit  c8cc685318cb78c62f1ff07bc561b26d65780aa3
Author: Andy Fiddaman <omnios@citrus-it.co.uk>
Date:   2019-01-17T00:49:47.000Z

    10225 wsdiff broken after 9979
    Reviewed by: Robert Mustacchi <rm@joyent.com>
    Reviewed by: Olaf Bohlen <olafbohlen@googlemail.com>
    Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
    Approved by: Dan McDonald <danmcd@joyent.com>

Also available in: Atom