Review updates

yarnpkg · Aug 1, 2017 · 9643175 · 9643175
1 parent 201ea6b
commit 9643175
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/__tests__/fixtures/lifecycle-scripts/script-segfault/app.js b/__tests__/fixtures/lifecycle-scripts/script-segfault/app.js
@@ -0,0 +1 @@
+process.kill(process.pid, "SIGSEGV");
diff --git a/__tests__/fixtures/lifecycle-scripts/script-segfault/package.json b/__tests__/fixtures/lifecycle-scripts/script-segfault/package.json
@@ -1,9 +1,5 @@
 {
   "scripts": {
-    "compile": "gcc segfault.c -g -o segfault",
-    "pretest": "yarn run compile",
-    "test": "./segfault",
-    "pretest-alt": "yarn run compile",
-    "test-alt": "./segfault && true"
+    "test": "node app.js"
   }
 }
diff --git a/__tests__/fixtures/lifecycle-scripts/script-segfault/segfault.c b/__tests__/fixtures/lifecycle-scripts/script-segfault/segfault.c
diff --git a/__tests__/lifecycle-scripts.js b/__tests__/lifecycle-scripts.js
@@ -158,7 +158,7 @@ test('should show correct error message when the script ends with an exit code',
 
 test('should show correct error message when the script ends an exit signal', async () => {
   await execCommand('test', 'script-segfault').catch(error => {
-    expect(error.message).toMatch(/Command failed with signal /);
+    expect(error.message).toMatch(/Command failed with signal "SIGSEGV"/);
     expect(error.code).not.toBe(0);
   });
 });
diff --git a/src/util/child.js b/src/util/child.js
@@ -95,30 +95,18 @@ export function spawn(
         }
 
         proc.on('close', (code: number, signal: string) => {
-          if (signal) {
+          if (signal || code >= 1) {
             err = new SpawnError(
               [
                 'Command failed.',
-                `Exit signal: ${signal}`,
+                signal ? `Exit signal: ${signal}` : `Exit code: ${code}`,
                 `Command: ${program}`,
                 `Arguments: ${args.join(' ')}`,
                 `Directory: ${opts.cwd || process.cwd()}`,
                 `Output:\n${stdout.trim()}`,
               ].join('\n'),
             );
             err.EXIT_SIGNAL = signal;
-          } else if (code >= 1) {
-            // TODO make this output nicer
-            err = new SpawnError(
-              [
-                'Command failed.',
-                `Exit code: ${code}`,
-                `Command: ${program}`,
-                `Arguments: ${args.join(' ')}`,
-                `Directory: ${opts.cwd || process.cwd()}`,
-                `Output:\n${stdout.trim()}`,
-              ].join('\n'),
-            );
             err.EXIT_CODE = code;
           }