diff options
| -rw-r--r-- | src/common.cc | 22 | ||||
| -rw-r--r-- | test/dump/bad-directory.txt | 2 | ||||
| -rw-r--r-- | test/pipes.txt | 7 | ||||
| -rwxr-xr-x | test/run-tests.py | 3 |
4 files changed, 24 insertions, 10 deletions
diff --git a/src/common.cc b/src/common.cc index 037b8304..d1873c2c 100644 --- a/src/common.cc +++ b/src/common.cc @@ -59,14 +59,16 @@ const char* g_reloc_type_name[] = { }; WABT_STATIC_ASSERT(WABT_ARRAY_SIZE(g_reloc_type_name) == kRelocTypeCount); -static Result ReadStdin(std::vector<uint8_t>* out_data) { +static Result ReadAll(FILE* stream, + const char* name, + std::vector<uint8_t>* out_data) { out_data->resize(0); uint8_t buffer[4096]; while (true) { - size_t bytes_read = fread(buffer, 1, sizeof(buffer), stdin); + size_t bytes_read = fread(buffer, 1, sizeof(buffer), stream); if (bytes_read == 0) { - if (ferror(stdin)) { - fprintf(stderr, "error reading from stdin: %s\n", strerror(errno)); + if (ferror(stream)) { + fprintf(stderr, "error reading from %s: %s\n", name, strerror(errno)); return Result::Error; } return Result::Ok; @@ -82,7 +84,7 @@ Result ReadFile(std::string_view filename, std::vector<uint8_t>* out_data) { const char* filename_cstr = filename_str.c_str(); if (filename == "-") { - return ReadStdin(out_data); + return ReadAll(stdin, "stdin", out_data); } struct stat statbuf; @@ -91,8 +93,8 @@ Result ReadFile(std::string_view filename, std::vector<uint8_t>* out_data) { return Result::Error; } - if (!(statbuf.st_mode & S_IFREG)) { - fprintf(stderr, "%s: not a regular file\n", filename_cstr); + if (statbuf.st_mode & S_IFDIR) { + fprintf(stderr, "%s: is a directory\n", filename_cstr); return Result::Error; } @@ -103,9 +105,11 @@ Result ReadFile(std::string_view filename, std::vector<uint8_t>* out_data) { } if (fseek(infile, 0, SEEK_END) < 0) { - perror("fseek to end failed"); + // not seekable, so we can't pre-allocate out_data, but let's try and read + // it anyway (for pipes, sockets, etc.) + auto res = ReadAll(infile, filename_cstr, out_data); fclose(infile); - return Result::Error; + return res; } long size = ftell(infile); diff --git a/test/dump/bad-directory.txt b/test/dump/bad-directory.txt index 253c3b38..4b14cdf9 100644 --- a/test/dump/bad-directory.txt +++ b/test/dump/bad-directory.txt @@ -1,5 +1,5 @@ ;;; RUN: %(wasm-objdump)s -d third_party/ ;;; ERROR: 1 (;; STDERR ;;; -third_party/: not a regular file +third_party/: is a directory ;;; STDERR ;;) diff --git a/test/pipes.txt b/test/pipes.txt new file mode 100644 index 00000000..fbe67136 --- /dev/null +++ b/test/pipes.txt @@ -0,0 +1,7 @@ +;;; PLATFORMS: Linux Darwin +;;; RUN: bash -c '%(wasm-stats)s <(%(wat2wasm)s /dev/stdin <<<"(module)" -o /dev/stdout)' +(;; STDOUT ;;; +Total opcodes: 0 +Opcode counts: +Opcode counts with immediates: +;;; STDOUT ;;) diff --git a/test/run-tests.py b/test/run-tests.py index 0bd241ea..370f75ef 100755 --- a/test/run-tests.py +++ b/test/run-tests.py @@ -20,6 +20,7 @@ import difflib import fnmatch import multiprocessing import os +import platform import re import shlex import shutil @@ -505,6 +506,8 @@ class TestInfo(object): elif key == 'ENV': # Pattern: FOO=1 BAR=stuff self.env = dict(x.split('=') for x in value.split()) + elif key == 'PLATFORMS': + self.skip = platform.system() not in value.split() else: raise Error('Unknown directive: %s' % key) |