Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 392c59b8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "cli-test: support checking exit status." am: b3dc6089 am: e4d33367... 

Merge "cli-test: support checking exit status." am: b3dc6089 am: e4d33367 am: 8ed537cb am: 1b7ddbc1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1439574

Change-Id: Ife2fab4a1bff3823630629f01a088772e0f94e7d
parents 40a80c8b 1b7ddbc1

cli-test/cli-test.cpp

+11 −4
Original line number Diff line number Diff line
@@ -146,6 +146,13 @@ static void CollectTests(std::vector<Test>* tests, const char* test_filename) { 
      test->befores.push_back(line);

    } else if (Match(&line, "after:")) {

      test->afters.push_back(line);

    } else if (Match(&line, "expected-exit-status:")) {

      char* end_p;

      errno = 0;

      test->exit_status = strtol(line.c_str(), &end_p, 10);

      if (errno != 0 || *end_p != '\0') {

        Die(0, "%s:%zu: bad exit status: \"%s\"", g_file, g_line, line.c_str());

      }

    } else if (Match(&line, "expected-stdout:")) {

      // Collect tab-indented lines.

      std::string text;
@@ -231,15 +238,15 @@ static int RunTests(const std::vector<Test>& tests) { 
      V("running command \"%s\"", test.command.c_str());

      CapturedStdout test_stdout;

      CapturedStderr test_stderr;

      int exit_status = system(test.command.c_str());

      int status = system(test.command.c_str());

      test_stdout.Stop();

      test_stderr.Stop();



      V("exit status %d", exit_status);

      if (exit_status != test.exit_status) {

      V("system() returned status %d", status);

      if (WEXITSTATUS(status) != test.exit_status) {

        failed = true;

        fprintf(stderr, "Incorrect exit status: expected %d but %s\n", test.exit_status,

                ExitStatusToString(exit_status).c_str());

                ExitStatusToString(status).c_str());

      }



      if (!CheckOutput("stdout", test_stdout.str(), test.expected_stdout, FILES)) failed = true;