diff options
| author | Aditya Mandaleeka <adityamandaleeka@users.noreply.github.com> | 2015-12-31 13:28:27 -0800 |
|---|---|---|
| committer | Aditya Mandaleeka <adityamandaleeka@users.noreply.github.com> | 2015-12-31 13:28:27 -0800 |
| commit | b80f60f3435438b964b0b5fb0c0753610fed6123 (patch) | |
| tree | cb57487c88fc9b7d8ae76381b8fc56f8bdf92a1a | |
| parent | f4c27343fbf4171e2703bb46cc24ad7aa1cc1c05 (diff) | |
| parent | 2998cc4210cbd070ed6f61351819beea65c08b7a (diff) | |
| download | coreclr-b80f60f3435438b964b0b5fb0c0753610fed6123.tar.gz coreclr-b80f60f3435438b964b0b5fb0c0753610fed6123.tar.bz2 coreclr-b80f60f3435438b964b0b5fb0c0753610fed6123.zip | |
Merge pull request #2495 from AndyAyersMS/LockJson
Actually lock the project.lock.json
| -rw-r--r-- | tests/src/JIT/config/benchmark+serialize/project.lock.json | 2 | ||||
| -rw-r--r-- | tests/testsFailingOutsideWindows.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/src/JIT/config/benchmark+serialize/project.lock.json b/tests/src/JIT/config/benchmark+serialize/project.lock.json index 02aaecab28..c591808265 100644 --- a/tests/src/JIT/config/benchmark+serialize/project.lock.json +++ b/tests/src/JIT/config/benchmark+serialize/project.lock.json @@ -1,5 +1,5 @@ { - "locked": false, + "locked": true, "version": 2, "targets": { "DNXCore,Version=v5.0": { diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt index 4688ea6b31..e4967e89da 100644 --- a/tests/testsFailingOutsideWindows.txt +++ b/tests/testsFailingOutsideWindows.txt @@ -214,3 +214,6 @@ JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r/throwincascade JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d/throwincascadedexceptnofin_d.sh JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r/throwincascadedexceptnofin_r.sh JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621/b13621.sh +JIT/Performance/CodeQuality/Serialization/Serialize/Serialize.sh +JIT/Performance/CodeQuality/Serialization/Deserialize/Deserialize.sh + |