ci: made codegen-nonreg.sh script less sensitive to merge conflicts

[fredbi]

Signed-off-by: Frederic BIDON fredbi@yahoo.com

[codecov]

Codecov Report

Merging #1983 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1983   +/-   ##
=======================================
  Coverage   80.93%   80.93%           
=======================================
  Files          47       47           
  Lines        8060     8060           
=======================================
  Hits         6523     6523           
  Misses       1042     1042           
  Partials      495      495

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 60799a0...8885894. Read the comment docs.

[codecov]

Codecov Report

❗ No coverage uploaded for pull request base (master@d6b79e0). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #1983   +/-   ##
=========================================
  Coverage          ?   80.33%           
=========================================
  Files             ?       46           
  Lines             ?     8167           
  Branches          ?        0           
=========================================
  Hits              ?     6561           
  Misses            ?     1100           
  Partials          ?      506

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d6b79e0...d7706fb. Read the comment docs.

[fredbi]

This is just a technical change in the CI script to ease a bit merge issues when rebasing PR which add some new specs to the global codegen build test.

[casualjim]

There is a merge conflict here that I'm not sure how to resolve

[fredbi]

@casualjim I'll merge this last.
Anyway, while doing this, I have been considering some larger CI undertaking: I'd wish to replace this ugly shell script by a golang test commander, which we could more easily parallelize. What do you think of https://godoc.org/gotest.tools/icmd ?

[casualjim]

fine by me