diff options
author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-08-26 12:47:25 +0200 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-08-26 12:47:25 +0200 |
commit | e0f1a60f5ff9d2efc8b106b5167f0170b8795dbe (patch) | |
tree | fe5c4c0b3da0b30841eef8184dade6e39e2c7407 /test/raytracer | |
parent | 8d2e4a51d56b7f4d3673a5132edd1adb37a14295 (diff) | |
parent | 7cfaf10b604372044f53cb65b03df33c23f8b26d (diff) | |
download | compcert-e0f1a60f5ff9d2efc8b106b5167f0170b8795dbe.tar.gz compcert-e0f1a60f5ff9d2efc8b106b5167f0170b8795dbe.zip |
Merge branch 'master' into debug_locations
Conflicts:
debug/CtoDwarf.ml
debug/DwarfPrinter.ml
debug/DwarfTypes.mli
Diffstat (limited to 'test/raytracer')
-rw-r--r-- | test/raytracer/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/raytracer/Makefile b/test/raytracer/Makefile index c6eb1907..1d4882bc 100644 --- a/test/raytracer/Makefile +++ b/test/raytracer/Makefile @@ -54,7 +54,7 @@ test: ./render < kal.gml @if cmp kal.ppm Results/kal.ppm; \ then echo "raytracer: passed"; \ - else echo "raytracer: FAILED"; \ + else echo "raytracer: FAILED"; exit 2; \ fi bench: |