diff --git a/aw/python/distributed/distribute/distribute.py b/aw/python/distributed/distribute/distribute.py index ad29c82ecfbba0fb086dcfb6b1235ec1769e755d..1a365829892579ff6201a03c2877d11b5712bf7e 100755 --- a/aw/python/distributed/distribute/distribute.py +++ b/aw/python/distributed/distribute/distribute.py @@ -254,14 +254,17 @@ class Distribute: if self.hdc_tools != "hdc": if self._query_device_uuid(self.major) != '': - device_uuid_list += self._query_device_uuid(self.major) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_uuid(self.major)) if self._query_device_ip(device) != "": - agent_ip_list += self._query_device_ip(device) + "," + agent_ip_list = "{}{},".format( + agent_ip_list, self._query_device_ip(device)) for agent in self.agent_list: if self._query_device_uuid(agent): - device_uuid_list += self._query_device_uuid(agent) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_uuid(agent)) config_info = DEVICE_INFO_TEMPLATE % (agent_ip_list, "8888", device_uuid_list) @@ -270,14 +273,17 @@ class Distribute: self._write_device_config(config_info, config_agent_file) else: if self._query_device_agent_uuid(self.major): - device_uuid_list += self._query_device_agent_uuid(self.major) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_agent_uuid(self.major)) if self._query_device_hdc_ip(device): - agent_ip_list += self._query_device_hdc_ip(device) + "," + agent_ip_list = "{}{},".format( + agent_ip_list, self._query_device_hdc_ip(device)) for agent in self.agent_list: if self._query_device_agent_uuid(agent): - device_uuid_list += self._query_device_agent_uuid(agent) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_agent_uuid(agent)) config_info = DEVICE_INFO_TEMPLATE % (agent_ip_list, "8888", device_uuid_list) @@ -291,12 +297,14 @@ class Distribute: if self.hdc_tools != "hdc": if self._query_device_uuid(self.major) != "NoneTyple": - device_uuid_list += self._query_device_uuid(self.major) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_uuid(self.major)) for agent in self.agent_list: if self._query_device_ip(agent) != "" and self._query_device_uuid(agent) != "": - agent_ip_list += self._query_device_ip(agent) + "," - device_uuid_list += self._query_device_uuid(agent) + "," + agent_ip_list = "{}{},".format(agent_ip_list, self._query_device_ip(agent)) + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_uuid(agent)) config_info = DEVICE_INFO_TEMPLATE % (agent_ip_list, "8888", device_uuid_list) @@ -305,12 +313,14 @@ class Distribute: self._write_device_config(config_info, config_major_file) else: if self._query_device_major_uuid(self.major): - device_uuid_list += self._query_device_major_uuid(self.major) + "," + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_major_uuid(self.major)) for agent in self.agent_list: if self._query_device_major_uuid(agent): - agent_ip_list += self._query_device_hdc_ip(agent) + "," - device_uuid_list += self._query_device_major_uuid(agent) + "," + agent_ip_list = "{}{},".format(agent_ip_list, self._query_device_hdc_ip(agent)) + device_uuid_list = "{}{},".format( + device_uuid_list, self._query_device_major_uuid(agent)) config_info = DEVICE_INFO_TEMPLATE % (agent_ip_list, "8888", device_uuid_list) diff --git a/install.sh b/install.sh index d74380b0937900ddf221d02349bbd97ad468c25a..35b39453db8528048fd8c1f6d19d498ea92a177a 100755 --- a/install.sh +++ b/install.sh @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +set -e sudo cp ohtest /usr/bin/ diff --git a/libs/fuzzlib/README_zh.md b/libs/fuzzlib/README_zh.md index bd8d505629bebccd87a7766d05e7a48d1cf9b99f..3196a74d33ae46a42744dcaccc470e4e21a5be83 100644 --- a/libs/fuzzlib/README_zh.md +++ b/libs/fuzzlib/README_zh.md @@ -316,10 +316,3 @@ run -t FUZZ -ss developer_test -tm calculator ``` details_report.html ``` - - 最新测试报告 - - ``` - reports/latest - ``` - diff --git a/libs/fuzzlib/tools/run_result.py b/libs/fuzzlib/tools/run_result.py index 875403b25f9b53f458c83ac2c02c0d856a0bff62..b8c1931e88ba2d775725fb6f4c0d0af577cd2465 100644 --- a/libs/fuzzlib/tools/run_result.py +++ b/libs/fuzzlib/tools/run_result.py @@ -72,9 +72,11 @@ class RunResult(): result = ansi_escape.sub('', log_str) return result + # 获取日志 def get_log(self): return "code :{}, msg: {}".format(self.code, self.data) + # 分析结果 def analysis(self, result, outdir): pass diff --git a/local_coverage/automate_execute/coverage.sh b/local_coverage/automate_execute/coverage.sh index af3848ff5b73d9fab54fda75a3d6571815e8ca3c..8a50364efcdd3a2d63fc2b38de84e00dfc27eb2a 100644 --- a/local_coverage/automate_execute/coverage.sh +++ b/local_coverage/automate_execute/coverage.sh @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +set -e echo "++++++++++++++++++++start install package+++++++++++++++++++++++"