fix(build): fix abstruse-pty program

bleenco · Sep 18, 2017 · d2e58a1 · d2e58a1
1 parent 924a456
commit d2e58a1
Show file tree

Hide file tree

Showing 7 changed files with 223 additions and 258 deletions.
diff --git a/protractor.conf.js b/protractor.conf.js
@@ -8,7 +8,7 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
     chromeOptions: {
-      args: ['--headless', '--disable-gpu', '--window-size=1024,768']
+      // args: ['--headless', '--disable-gpu', '--window-size=1024,768']
     }
   },
   directConnect: true,

diff --git a/src/api/docker.ts b/src/api/docker.ts
@@ -25,7 +25,9 @@ export function createContainer(
       Cmd: ['/bin/bash'],
       Env: envs || [],
       Binds: ['/var/run/docker.sock:/var/run/docker.sock'],
-      Privileged: true
+      HostConfig: {
+        Privileged: true
+      }
     } as any)
     .then(container => container.start())
     .then(() => observer.complete())

diff --git a/src/files/scripts/abstruse-pty.c b/src/files/scripts/abstruse-pty.c
@@ -52,8 +52,14 @@ int main(int argc, char *argv[]) {
     close(fd[1]);
 
     int status;
-    waitpid(pid, &status, 0);
+    if (waitpid(pid, &status, 0) == -1) {
+      perror("waitpid failed");
+      return EXIT_FAILURE;
+    }
 
-    return status;
+    if (WIFEXITED(status)) {
+      const int code = WEXITSTATUS(status);
+      return code;
+    }
   }
 }
diff --git a/tests/dev-scripts/data/push-abstruse.json b/tests/dev-scripts/data/push-abstruse.json