From e3668daaa5976f45ab1b60d3d27a2c023deb919f Mon Sep 17 00:00:00 2001 From: Phoebe Nichols Date: Thu, 1 Aug 2019 06:37:47 -0700 Subject: [PATCH] Add test incremental_analysis_remove_file to the toplevel makefile Summary: Add test `incremental_analysis_remove_file` to the toplevel makefile so that it is called by `make test` etc Also swapped the src_before and src_after files so the test checks file removal instead of addition. Reviewed By: jvillard Differential Revision: D16562340 fbshipit-source-id: 79bab5f66 --- .gitignore | 2 +- Makefile | 3 ++- .../reverse_analysis_callgraph.dot | 17 ----------------- .../Makefile | 6 ++++-- .../changed_files.txt | 0 .../costs_summary.json.exp | 0 .../fixed.exp | 0 .../introduced.exp | 0 .../preexisting.exp | 0 .../reverse_analysis_callgraph.dot | 13 +++++++++++++ .../src_after/a_and_c.h | 0 .../src_after/b_and_d.c | 0 .../src_after/b_and_d.h | 0 .../src_after/main.c | 0 .../src_before}/a_and_c.c | 0 .../src_before/a_and_c.h | 0 .../src_before/b_and_d.c | 0 .../src_before/b_and_d.h | 0 .../src_before/main.c | 0 19 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 infer/tests/build_systems/incremental_analysis/reverse_analysis_callgraph.dot rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/Makefile (91%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/changed_files.txt (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/costs_summary.json.exp (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/fixed.exp (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/introduced.exp (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/preexisting.exp (100%) create mode 100644 infer/tests/build_systems/incremental_analysis_remove_file/reverse_analysis_callgraph.dot rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/src_after/a_and_c.h (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/src_after/b_and_d.c (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/src_after/b_and_d.h (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/src_after/main.c (100%) rename infer/tests/build_systems/{incremental_analysis/src_after => incremental_analysis_remove_file/src_before}/a_and_c.c (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/src_before/a_and_c.h (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/src_before/b_and_d.c (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/src_before/b_and_d.h (100%) rename infer/tests/build_systems/{incremental_analysis => incremental_analysis_remove_file}/src_before/main.c (100%) diff --git a/.gitignore b/.gitignore index 83a86ea1b..4c4b0b93c 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,7 @@ duplicates.txt /infer/tests/build_systems/differential_*/**/*.class /infer/tests/build_systems/differential_*/**/Diff*.java /infer/tests/build_systems/genrule/report.json -/infer/tests/build_systems/incremental_analysis/src +/infer/tests/build_systems/incremental_analysis_remove_file/src /infer/tests/build_systems/java_test_determinator/*.test /infer/tests/codetoanalyze/java/classloads/*.loads /infer/tests/codetoanalyze/java/classloads/loads.exp diff --git a/Makefile b/Makefile index ef5005126..b60ced540 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ BUILD_SYSTEMS_TESTS += \ tracebugs \ utf8_in_procname \ export_changed_functions \ - buck_export_changed_functions \ + incremental_analysis_remove_file \ DIRECT_TESTS += \ c_biabduction \ @@ -80,6 +80,7 @@ BUILD_SYSTEMS_TESTS += \ buck_flavors_diff \ buck_flavors_run \ buck_flavors_deterministic \ + buck_export_changed_functions \ endif ifneq ($(CMAKE),no) diff --git a/infer/tests/build_systems/incremental_analysis/reverse_analysis_callgraph.dot b/infer/tests/build_systems/incremental_analysis/reverse_analysis_callgraph.dot deleted file mode 100644 index c6b411cab..000000000 --- a/infer/tests/build_systems/incremental_analysis/reverse_analysis_callgraph.dot +++ /dev/null @@ -1,17 +0,0 @@ - -digraph callgraph { - N1 [ label = "a", flag = true ]; - N1 -> N4 ; - - N0 [ label = "b", flag = true ]; - N0 -> N1 ; - - N4 [ label = "main", flag = true ]; - - N2 [ label = "c", flag = true ]; - N2 -> N0 ; - - N3 [ label = "d", flag = false ]; - N3 -> N2 ; - -} diff --git a/infer/tests/build_systems/incremental_analysis/Makefile b/infer/tests/build_systems/incremental_analysis_remove_file/Makefile similarity index 91% rename from infer/tests/build_systems/incremental_analysis/Makefile rename to infer/tests/build_systems/incremental_analysis_remove_file/Makefile index 5e2eb043d..85ce48211 100644 --- a/infer/tests/build_systems/incremental_analysis/Makefile +++ b/infer/tests/build_systems/incremental_analysis_remove_file/Makefile @@ -37,7 +37,9 @@ $(PREVIOUS_REPORT): $(INFER_CLANG_DEPS) $(SOURCES) $(CURRENT_REPORT) $(QUIET)$(REMOVE_DIR) src $(QUIET)$(MKDIR_P) src $(QUIET)$(COPY) src_before/* src/ + $(QUIET)$(REMOVE_DIR) $(PREVIOUS_DIR) $(QUIET)$(COPY) -r $(CURRENT_DIR) $(PREVIOUS_DIR) - $(QUIET)$(INFER_BIN) -o $(PREVIOUS_DIR) $(INFER_OPTIONS) -- clang -c src/*.c + $(QUIET)$(REMOVE) $@ + $(QUIET)$(INFER_BIN) -o $(PREVIOUS_DIR) $(INFER_OPTIONS) -- clang -c src/*.c $(QUIET)$(COPY) $(PREVIOUS_DIR)/reverse_analysis_callgraph.dot \ - reverse_analysis_callgraph.dot.test + reverse_analysis_callgraph.dot.test diff --git a/infer/tests/build_systems/incremental_analysis/changed_files.txt b/infer/tests/build_systems/incremental_analysis_remove_file/changed_files.txt similarity index 100% rename from infer/tests/build_systems/incremental_analysis/changed_files.txt rename to infer/tests/build_systems/incremental_analysis_remove_file/changed_files.txt diff --git a/infer/tests/build_systems/incremental_analysis/costs_summary.json.exp b/infer/tests/build_systems/incremental_analysis_remove_file/costs_summary.json.exp similarity index 100% rename from infer/tests/build_systems/incremental_analysis/costs_summary.json.exp rename to infer/tests/build_systems/incremental_analysis_remove_file/costs_summary.json.exp diff --git a/infer/tests/build_systems/incremental_analysis/fixed.exp b/infer/tests/build_systems/incremental_analysis_remove_file/fixed.exp similarity index 100% rename from infer/tests/build_systems/incremental_analysis/fixed.exp rename to infer/tests/build_systems/incremental_analysis_remove_file/fixed.exp diff --git a/infer/tests/build_systems/incremental_analysis/introduced.exp b/infer/tests/build_systems/incremental_analysis_remove_file/introduced.exp similarity index 100% rename from infer/tests/build_systems/incremental_analysis/introduced.exp rename to infer/tests/build_systems/incremental_analysis_remove_file/introduced.exp diff --git a/infer/tests/build_systems/incremental_analysis/preexisting.exp b/infer/tests/build_systems/incremental_analysis_remove_file/preexisting.exp similarity index 100% rename from infer/tests/build_systems/incremental_analysis/preexisting.exp rename to infer/tests/build_systems/incremental_analysis_remove_file/preexisting.exp diff --git a/infer/tests/build_systems/incremental_analysis_remove_file/reverse_analysis_callgraph.dot b/infer/tests/build_systems/incremental_analysis_remove_file/reverse_analysis_callgraph.dot new file mode 100644 index 000000000..ff7207314 --- /dev/null +++ b/infer/tests/build_systems/incremental_analysis_remove_file/reverse_analysis_callgraph.dot @@ -0,0 +1,13 @@ + +digraph callgraph { + N1 [ label = "b", flag = true ]; + + N0 [ label = "c", flag = true ]; + N0 -> N1 ; + + N2 [ label = "a", flag = true ]; + N2 -> N3 ; + + N3 [ label = "main", flag = true ]; + +} diff --git a/infer/tests/build_systems/incremental_analysis/src_after/a_and_c.h b/infer/tests/build_systems/incremental_analysis_remove_file/src_after/a_and_c.h similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_after/a_and_c.h rename to infer/tests/build_systems/incremental_analysis_remove_file/src_after/a_and_c.h diff --git a/infer/tests/build_systems/incremental_analysis/src_after/b_and_d.c b/infer/tests/build_systems/incremental_analysis_remove_file/src_after/b_and_d.c similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_after/b_and_d.c rename to infer/tests/build_systems/incremental_analysis_remove_file/src_after/b_and_d.c diff --git a/infer/tests/build_systems/incremental_analysis/src_after/b_and_d.h b/infer/tests/build_systems/incremental_analysis_remove_file/src_after/b_and_d.h similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_after/b_and_d.h rename to infer/tests/build_systems/incremental_analysis_remove_file/src_after/b_and_d.h diff --git a/infer/tests/build_systems/incremental_analysis/src_after/main.c b/infer/tests/build_systems/incremental_analysis_remove_file/src_after/main.c similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_after/main.c rename to infer/tests/build_systems/incremental_analysis_remove_file/src_after/main.c diff --git a/infer/tests/build_systems/incremental_analysis/src_after/a_and_c.c b/infer/tests/build_systems/incremental_analysis_remove_file/src_before/a_and_c.c similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_after/a_and_c.c rename to infer/tests/build_systems/incremental_analysis_remove_file/src_before/a_and_c.c diff --git a/infer/tests/build_systems/incremental_analysis/src_before/a_and_c.h b/infer/tests/build_systems/incremental_analysis_remove_file/src_before/a_and_c.h similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_before/a_and_c.h rename to infer/tests/build_systems/incremental_analysis_remove_file/src_before/a_and_c.h diff --git a/infer/tests/build_systems/incremental_analysis/src_before/b_and_d.c b/infer/tests/build_systems/incremental_analysis_remove_file/src_before/b_and_d.c similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_before/b_and_d.c rename to infer/tests/build_systems/incremental_analysis_remove_file/src_before/b_and_d.c diff --git a/infer/tests/build_systems/incremental_analysis/src_before/b_and_d.h b/infer/tests/build_systems/incremental_analysis_remove_file/src_before/b_and_d.h similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_before/b_and_d.h rename to infer/tests/build_systems/incremental_analysis_remove_file/src_before/b_and_d.h diff --git a/infer/tests/build_systems/incremental_analysis/src_before/main.c b/infer/tests/build_systems/incremental_analysis_remove_file/src_before/main.c similarity index 100% rename from infer/tests/build_systems/incremental_analysis/src_before/main.c rename to infer/tests/build_systems/incremental_analysis_remove_file/src_before/main.c