[headless] Can run the demo against osh-cpp

And put it in the CI!

Author: Andy C

client/headless_demo.py

@@ -79,6 +79,9 @@ def main(argv):
   p.add_option(
       '--stderr-file', dest='stderr_file', default='/dev/stderr',
       help='Where the server should send child stdout')
+  p.add_option(
+      '--sh-binary', dest='sh_binary', default='bin/osh',
+      help='Which shell binary to launch')
 
   # Use a terminal instead
   p.add_option(
@@ -97,7 +100,7 @@ def main(argv):
   os.set_inheritable(left.fileno(), True)
   os.set_inheritable(right.fileno(), True)
 
-  child_argv = ['bin/osh', '--headless']
+  child_argv = [opts.sh_binary, '--headless']
 
   ret = os.fork()
   if ret < 0:

client/run.sh

@@ -7,8 +7,14 @@ set -o nounset
 set -o pipefail
 set -o errexit
 
-demo() {
-  echo mystdin | client/headless_demo.py
+py-demo() {
+  echo mystdin | client/headless_demo.py --sh-binary bin/osh
+}
+
+cpp-demo() {
+  local bin=_bin/cxx-dbg/osh
+  ninja $bin
+  echo mystdin | client/headless_demo.py --sh-binary $bin
 }
 
 errors() {
@@ -32,13 +38,17 @@ demo-pty() {
   echo mystdin | client/headless_demo.py --to-new-pty
 }
 
-soil-run() {
-  demo
+soil-run-py() {
+  py-demo
   echo
 
   errors
   echo
 }
 
+soil-run-cpp() {
+  cpp-demo
+}
+
 
 "$@"

soil/worker.sh

@@ -94,7 +94,7 @@ oil-large           ysh/run.sh soil-run                          -
 tea-large           tea/run.sh soil-run                          -
 link-busybox-ash    test/spec-bin.sh link-busybox-ash            -
 osh-minimal         test/spec-py.sh osh-minimal                  _tmp/spec/osh-minimal/index.html
-headless            client/run.sh soil-run                       -
+headless            client/run.sh soil-run-py                    -
 EOF
 }
 
@@ -181,6 +181,7 @@ build-minimal    build/py.sh minimal                   -
 ninja-config     soil/worker.sh ninja-config           -
 cpp-unit         test/cpp-unit.sh soil-run             _test/cpp-unit.html
 oils-cpp-smoke   build/native.sh soil-run              -
+headless         client/run.sh soil-run-cpp            -
 asan             test/asan.sh soil-run                 -
 ltrace           test/ltrace.sh soil-run               -
 line-counts      metrics/source-code.sh write-reports  _tmp/metrics/line-counts/index.html