diff --git a/test/failure_handler/src/share/conf/linux.properties b/test/failure_handler/src/share/conf/linux.properties index b3ef553b6f7..bb7eef38d12 100644 --- a/test/failure_handler/src/share/conf/linux.properties +++ b/test/failure_handler/src/share/conf/linux.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -68,7 +68,7 @@ environment=\ memory.vmstat.slabinfo memory.vmstat.disk \ files \ locks \ - net.sockets net.statistics + net.sockets net.statistics net.ifconfig ################################################################################ users.current.app=id users.current.args=-a @@ -103,8 +103,11 @@ files.app=lsof locks.app=lslocks locks.args=-u -net.app=netstat +net.sockets.app=netstat net.sockets.args=-aeeopv +net.statistics.app=netstat net.statistics.args=-sv +net.ifconfig.app=ifconfig +net.ifconfig.args=-a ################################################################################ diff --git a/test/failure_handler/src/share/conf/mac.properties b/test/failure_handler/src/share/conf/mac.properties index 53b5858591d..401901610fd 100644 --- a/test/failure_handler/src/share/conf/mac.properties +++ b/test/failure_handler/src/share/conf/mac.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -75,8 +75,7 @@ environment=\ process.ps process.top \ memory.vmstat \ files \ - netstat.av netstat.aL netstat.m netstat.s \ - ifconfig \ + net.netstat.av net.netstat.aL net.netstat.m net.netstat.s net.ifconfig \ scutil.nwi scutil.proxy ################################################################################ users.current.app=id @@ -105,14 +104,13 @@ memory.vmstat.args=-c 3 3 files.app=lsof -netstat.app=netstat -netstat.av.args=-av -netstat.aL.args=-aL -netstat.m.args=-m -netstat.s.args=-s - -ifconfig.app=ifconfig -ifconfig.args=-a +net.netstat.app=netstat +net.netstat.av.args=-av +net.netstat.aL.args=-aL +net.netstat.m.args=-m +net.netstat.s.args=-s +net.ifconfig.app=ifconfig +net.ifconfig.args=-a scutil.app=scutil scutil.nwi.args=--nwi diff --git a/test/failure_handler/src/share/conf/solaris.properties b/test/failure_handler/src/share/conf/solaris.properties index 69c12cfc614..1fd967669d6 100644 --- a/test/failure_handler/src/share/conf/solaris.properties +++ b/test/failure_handler/src/share/conf/solaris.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -64,7 +64,7 @@ environment=\ system.dmesg system.prtconf system.sysdef \ process.ps process.top \ memory.swap memory.vmstat.default memory.vmstat.statistics memory.pagesize \ - netstat.av netstat.m netstat.s netstat.i + net.netstat.av net.netstat.m net.netstat.s net.netstat.i net.ifconfig ################################################################################ # common unix ################################################################################ @@ -103,9 +103,11 @@ memory.pagesize.app=pagesize # prstat.app=prstat # prstat.args=-a -netstat.app=netstat -netstat.av.args=-av -netstat.m.args=-m -netstat.s.args=-s -netstat.i.args=-i 1 5 +net.netstat.app=netstat +net.netstat.av.args=-av +net.netstat.m.args=-m +net.netstat.s.args=-s +net.netstat.i.args=-i 1 5 +net.ifconfig.app=/sbin/ifconfig +net.ifconfig.args=-a ################################################################################ diff --git a/test/failure_handler/src/share/conf/windows.properties b/test/failure_handler/src/share/conf/windows.properties index ed5385cba83..0c76ac2c476 100644 --- a/test/failure_handler/src/share/conf/windows.properties +++ b/test/failure_handler/src/share/conf/windows.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -71,7 +71,7 @@ environment=\ memory.free memory.vmstat.default memory.vmstat.statistics \ memory.vmstat.slabinfo memory.vmstat.disk \ files \ - net.sockets net.statistics + net.sockets net.statistics net.ipconfig ################################################################################ users.current.app=id users.current.args=-a @@ -112,4 +112,6 @@ net.sockets.args=-c\0netstat -b -a -t -o || netstat -a -t -o net.sockets.args.delimiter=\0 net.statistics.app=netstat net.statistics.args=-s -e +net.ipconfig.app=ipconfig +net.ipconfig.args=/all ################################################################################