diff options
| author | Stephen Hines <srhines@google.com> | 2012-09-20 10:38:02 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2012-10-11 00:52:56 -0700 |
| commit | cf9a73a4140402c0e9e4fbab27477f22cc7d8e3c (patch) | |
| tree | 9b43c079dce3892b4d605d8a5ba9e302de220d68 /tests | |
| parent | bcae1fe692a8c5d9225a9699a932380b5659a735 (diff) | |
| download | slang-cf9a73a4140402c0e9e4fbab27477f22cc7d8e3c.tar.gz | |
Fix teardown bug for multiple files without pragma.
This previously caused a segmentation fault in llvm-rs-cc. We were
improperly using the DiagnosticsEngine after we had reset() everything.
Bug: 7202787
Change-Id: Ic8522566ef257e70f16caf34b89f6a8e012908c5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/F_no_pragma/first.rs | 3 | ||||
| -rw-r--r-- | tests/F_no_pragma/second.rs | 2 | ||||
| -rw-r--r-- | tests/F_no_pragma/stderr.txt.expect | 1 | ||||
| -rw-r--r-- | tests/F_no_pragma/stdout.txt.expect | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/tests/F_no_pragma/first.rs b/tests/F_no_pragma/first.rs new file mode 100644 index 0000000..a53bf90 --- /dev/null +++ b/tests/F_no_pragma/first.rs @@ -0,0 +1,3 @@ +#pragma version(1) +#pragma rs java_package_name(foo) + diff --git a/tests/F_no_pragma/second.rs b/tests/F_no_pragma/second.rs new file mode 100644 index 0000000..a746ce1 --- /dev/null +++ b/tests/F_no_pragma/second.rs @@ -0,0 +1,2 @@ +#pragma version(1) + diff --git a/tests/F_no_pragma/stderr.txt.expect b/tests/F_no_pragma/stderr.txt.expect new file mode 100644 index 0000000..8b4c80e --- /dev/null +++ b/tests/F_no_pragma/stderr.txt.expect @@ -0,0 +1 @@ +second.rs:2:1: error: missing "#pragma rs java_package_name(com.foo.bar)" in source file diff --git a/tests/F_no_pragma/stdout.txt.expect b/tests/F_no_pragma/stdout.txt.expect new file mode 100644 index 0000000..1a30d53 --- /dev/null +++ b/tests/F_no_pragma/stdout.txt.expect @@ -0,0 +1 @@ +Generating ScriptC_first.java ... |