equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. |
7 # published by the Free Software Foundation. |
224 |
224 |
225 BUNDLE_UP_AND_EXIT = \ |
225 BUNDLE_UP_AND_EXIT = \ |
226 ( \ |
226 ( \ |
227 jtregExitCode=$$? && \ |
227 jtregExitCode=$$? && \ |
228 _summary="$(SUMMARY_TXT)"; \ |
228 _summary="$(SUMMARY_TXT)"; \ |
|
229 if [ $${jtregExitCode} = 1 ] ; then \ |
|
230 jtregExitCode=0; \ |
|
231 fi; \ |
229 $(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST) $(EXITCODE); \ |
232 $(RM) -f $(STATS_TXT) $(RUNLIST) $(PASSLIST) $(FAILLIST) $(EXITCODE); \ |
230 $(ECHO) "$${jtregExitCode}" > $(EXITCODE); \ |
233 $(ECHO) "$${jtregExitCode}" > $(EXITCODE); \ |
231 if [ -r "$${_summary}" ] ; then \ |
234 if [ -r "$${_summary}" ] ; then \ |
232 $(ECHO) "Summary: $(UNIQUE_DIR)" > $(STATS_TXT); \ |
235 $(ECHO) "Summary: $(UNIQUE_DIR)" > $(STATS_TXT); \ |
233 $(EXPAND) $${_summary} | $(EGREP) -v ' Not run\.' > $(RUNLIST); \ |
236 $(EXPAND) $${_summary} | $(EGREP) -v ' Not run\.' > $(RUNLIST); \ |