From 086d6da1dfb5086b56eb9bd3136a0d9d1dd09db9 Mon Sep 17 00:00:00 2001 From: Daniel Kroening Date: Fri, 6 Oct 2017 14:32:24 +0100 Subject: [PATCH] moved taint-related tests for goto-analyzer into separate subdirectory --- regression/Makefile | 1 + regression/goto-analyzer-taint/Makefile | 25 ++++++++++++++++++ .../taint-aliasing1/aliasing1.class | Bin .../taint-aliasing1/aliasing1.java | 0 .../taint-aliasing1/taint.json | 0 .../taint-aliasing1/test.desc | 0 .../taint-basic1/basic1.class | Bin .../taint-basic1/basic1.java | 0 .../taint-basic1/taint.json | 0 .../taint-basic1/test.desc | 0 .../taint-basic2/basic2.class | Bin .../taint-basic2/basic2.java | 0 .../taint-basic2/taint.json | 0 .../taint-basic2/test.desc | 0 .../taint-interface1/interface1.class | Bin .../taint-interface1/interface1.java | 0 .../taint-interface1/my_I.class | Bin .../taint-interface1/some_class.class | Bin .../taint-interface1/taint.json | 0 .../taint-interface1/test.desc | 0 .../taint-interproc1/interproc1.class | Bin .../taint-interproc1/interproc1.java | 0 .../taint-interproc1/taint.json | 0 .../taint-interproc1/test.desc | 0 .../taint-map1/map1.class | Bin .../taint-map1/map1.java | 0 .../taint-map1/taint.json | 0 .../taint-map1/test.desc | 0 28 files changed, 26 insertions(+) create mode 100644 regression/goto-analyzer-taint/Makefile rename regression/{goto-analyzer => goto-analyzer-taint}/taint-aliasing1/aliasing1.class (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-aliasing1/aliasing1.java (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-aliasing1/taint.json (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-aliasing1/test.desc (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-basic1/basic1.class (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-basic1/basic1.java (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-basic1/taint.json (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-basic1/test.desc (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-basic2/basic2.class (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-basic2/basic2.java (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-basic2/taint.json (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-basic2/test.desc (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interface1/interface1.class (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interface1/interface1.java (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interface1/my_I.class (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interface1/some_class.class (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interface1/taint.json (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interface1/test.desc (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interproc1/interproc1.class (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interproc1/interproc1.java (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interproc1/taint.json (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-interproc1/test.desc (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-map1/map1.class (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-map1/map1.java (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-map1/taint.json (100%) rename regression/{goto-analyzer => goto-analyzer-taint}/taint-map1/test.desc (100%) diff --git a/regression/Makefile b/regression/Makefile index 243d65a460..418a2501dd 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -5,6 +5,7 @@ DIRS = ansi-c \ cbmc-java-inheritance \ cpp \ goto-analyzer \ + goto-analyzer-taint \ goto-cc-cbmc \ goto-cc-goto-analyzer \ goto-diff \ diff --git a/regression/goto-analyzer-taint/Makefile b/regression/goto-analyzer-taint/Makefile new file mode 100644 index 0000000000..ca7e7707af --- /dev/null +++ b/regression/goto-analyzer-taint/Makefile @@ -0,0 +1,25 @@ +default: tests.log + +test: + @if ! ../test.pl -c ../../../src/goto-analyzer/goto-analyzer ; then \ + ../failed-tests-printer.pl ; \ + exit 1 ; \ + fi + +tests.log: ../test.pl + @if ! ../test.pl -c ../../../src/goto-analyzer/goto-analyzer ; then \ + ../failed-tests-printer.pl ; \ + exit 1 ; \ + fi + +show: + @for dir in *; do \ + if [ -d "$$dir" ]; then \ + vim -o "$$dir/*.java" "$$dir/*.out"; \ + fi; \ + done; + +clean: + find -name '*.out' -execdir $(RM) '{}' \; + find -name '*.gb' -execdir $(RM) '{}' \; + $(RM) tests.log diff --git a/regression/goto-analyzer/taint-aliasing1/aliasing1.class b/regression/goto-analyzer-taint/taint-aliasing1/aliasing1.class similarity index 100% rename from regression/goto-analyzer/taint-aliasing1/aliasing1.class rename to regression/goto-analyzer-taint/taint-aliasing1/aliasing1.class diff --git a/regression/goto-analyzer/taint-aliasing1/aliasing1.java b/regression/goto-analyzer-taint/taint-aliasing1/aliasing1.java similarity index 100% rename from regression/goto-analyzer/taint-aliasing1/aliasing1.java rename to regression/goto-analyzer-taint/taint-aliasing1/aliasing1.java diff --git a/regression/goto-analyzer/taint-aliasing1/taint.json b/regression/goto-analyzer-taint/taint-aliasing1/taint.json similarity index 100% rename from regression/goto-analyzer/taint-aliasing1/taint.json rename to regression/goto-analyzer-taint/taint-aliasing1/taint.json diff --git a/regression/goto-analyzer/taint-aliasing1/test.desc b/regression/goto-analyzer-taint/taint-aliasing1/test.desc similarity index 100% rename from regression/goto-analyzer/taint-aliasing1/test.desc rename to regression/goto-analyzer-taint/taint-aliasing1/test.desc diff --git a/regression/goto-analyzer/taint-basic1/basic1.class b/regression/goto-analyzer-taint/taint-basic1/basic1.class similarity index 100% rename from regression/goto-analyzer/taint-basic1/basic1.class rename to regression/goto-analyzer-taint/taint-basic1/basic1.class diff --git a/regression/goto-analyzer/taint-basic1/basic1.java b/regression/goto-analyzer-taint/taint-basic1/basic1.java similarity index 100% rename from regression/goto-analyzer/taint-basic1/basic1.java rename to regression/goto-analyzer-taint/taint-basic1/basic1.java diff --git a/regression/goto-analyzer/taint-basic1/taint.json b/regression/goto-analyzer-taint/taint-basic1/taint.json similarity index 100% rename from regression/goto-analyzer/taint-basic1/taint.json rename to regression/goto-analyzer-taint/taint-basic1/taint.json diff --git a/regression/goto-analyzer/taint-basic1/test.desc b/regression/goto-analyzer-taint/taint-basic1/test.desc similarity index 100% rename from regression/goto-analyzer/taint-basic1/test.desc rename to regression/goto-analyzer-taint/taint-basic1/test.desc diff --git a/regression/goto-analyzer/taint-basic2/basic2.class b/regression/goto-analyzer-taint/taint-basic2/basic2.class similarity index 100% rename from regression/goto-analyzer/taint-basic2/basic2.class rename to regression/goto-analyzer-taint/taint-basic2/basic2.class diff --git a/regression/goto-analyzer/taint-basic2/basic2.java b/regression/goto-analyzer-taint/taint-basic2/basic2.java similarity index 100% rename from regression/goto-analyzer/taint-basic2/basic2.java rename to regression/goto-analyzer-taint/taint-basic2/basic2.java diff --git a/regression/goto-analyzer/taint-basic2/taint.json b/regression/goto-analyzer-taint/taint-basic2/taint.json similarity index 100% rename from regression/goto-analyzer/taint-basic2/taint.json rename to regression/goto-analyzer-taint/taint-basic2/taint.json diff --git a/regression/goto-analyzer/taint-basic2/test.desc b/regression/goto-analyzer-taint/taint-basic2/test.desc similarity index 100% rename from regression/goto-analyzer/taint-basic2/test.desc rename to regression/goto-analyzer-taint/taint-basic2/test.desc diff --git a/regression/goto-analyzer/taint-interface1/interface1.class b/regression/goto-analyzer-taint/taint-interface1/interface1.class similarity index 100% rename from regression/goto-analyzer/taint-interface1/interface1.class rename to regression/goto-analyzer-taint/taint-interface1/interface1.class diff --git a/regression/goto-analyzer/taint-interface1/interface1.java b/regression/goto-analyzer-taint/taint-interface1/interface1.java similarity index 100% rename from regression/goto-analyzer/taint-interface1/interface1.java rename to regression/goto-analyzer-taint/taint-interface1/interface1.java diff --git a/regression/goto-analyzer/taint-interface1/my_I.class b/regression/goto-analyzer-taint/taint-interface1/my_I.class similarity index 100% rename from regression/goto-analyzer/taint-interface1/my_I.class rename to regression/goto-analyzer-taint/taint-interface1/my_I.class diff --git a/regression/goto-analyzer/taint-interface1/some_class.class b/regression/goto-analyzer-taint/taint-interface1/some_class.class similarity index 100% rename from regression/goto-analyzer/taint-interface1/some_class.class rename to regression/goto-analyzer-taint/taint-interface1/some_class.class diff --git a/regression/goto-analyzer/taint-interface1/taint.json b/regression/goto-analyzer-taint/taint-interface1/taint.json similarity index 100% rename from regression/goto-analyzer/taint-interface1/taint.json rename to regression/goto-analyzer-taint/taint-interface1/taint.json diff --git a/regression/goto-analyzer/taint-interface1/test.desc b/regression/goto-analyzer-taint/taint-interface1/test.desc similarity index 100% rename from regression/goto-analyzer/taint-interface1/test.desc rename to regression/goto-analyzer-taint/taint-interface1/test.desc diff --git a/regression/goto-analyzer/taint-interproc1/interproc1.class b/regression/goto-analyzer-taint/taint-interproc1/interproc1.class similarity index 100% rename from regression/goto-analyzer/taint-interproc1/interproc1.class rename to regression/goto-analyzer-taint/taint-interproc1/interproc1.class diff --git a/regression/goto-analyzer/taint-interproc1/interproc1.java b/regression/goto-analyzer-taint/taint-interproc1/interproc1.java similarity index 100% rename from regression/goto-analyzer/taint-interproc1/interproc1.java rename to regression/goto-analyzer-taint/taint-interproc1/interproc1.java diff --git a/regression/goto-analyzer/taint-interproc1/taint.json b/regression/goto-analyzer-taint/taint-interproc1/taint.json similarity index 100% rename from regression/goto-analyzer/taint-interproc1/taint.json rename to regression/goto-analyzer-taint/taint-interproc1/taint.json diff --git a/regression/goto-analyzer/taint-interproc1/test.desc b/regression/goto-analyzer-taint/taint-interproc1/test.desc similarity index 100% rename from regression/goto-analyzer/taint-interproc1/test.desc rename to regression/goto-analyzer-taint/taint-interproc1/test.desc diff --git a/regression/goto-analyzer/taint-map1/map1.class b/regression/goto-analyzer-taint/taint-map1/map1.class similarity index 100% rename from regression/goto-analyzer/taint-map1/map1.class rename to regression/goto-analyzer-taint/taint-map1/map1.class diff --git a/regression/goto-analyzer/taint-map1/map1.java b/regression/goto-analyzer-taint/taint-map1/map1.java similarity index 100% rename from regression/goto-analyzer/taint-map1/map1.java rename to regression/goto-analyzer-taint/taint-map1/map1.java diff --git a/regression/goto-analyzer/taint-map1/taint.json b/regression/goto-analyzer-taint/taint-map1/taint.json similarity index 100% rename from regression/goto-analyzer/taint-map1/taint.json rename to regression/goto-analyzer-taint/taint-map1/taint.json diff --git a/regression/goto-analyzer/taint-map1/test.desc b/regression/goto-analyzer-taint/taint-map1/test.desc similarity index 100% rename from regression/goto-analyzer/taint-map1/test.desc rename to regression/goto-analyzer-taint/taint-map1/test.desc