From badf6d159dada727acfb5394bd17de223b336975 Mon Sep 17 00:00:00 2001 From: Zhaolong Zhu Date: Tue, 21 Mar 2023 13:04:28 -0700 Subject: [PATCH] getdeps: remove test-getdeps from Sapling manifest (#4373) Summary: X-link: https://github.com/facebookincubator/velox/pull/4373 We are now planning to remove the Sapling getdeps build since Sapling doesn't use it for open source anyway. The EdenFS getdeps build will adapt one way or another. This diff only remove the test step of the Sapling getdeps, which is failing now. Will remove the entire Sapling manifest the following diff. Reviewed By: quark-zju Differential Revision: D44233463 fbshipit-source-id: c29419ab316fb1d0c3131d00b2fe3b4e3bb879e6 --- build/fbcode_builder/manifests/sapling | 3 --- eden/scm/Makefile | 6 ------ 2 files changed, 9 deletions(-) diff --git a/build/fbcode_builder/manifests/sapling b/build/fbcode_builder/manifests/sapling index a146b1ac8ac2c..3282ba719578d 100644 --- a/build/fbcode_builder/manifests/sapling +++ b/build/fbcode_builder/manifests/sapling @@ -22,9 +22,6 @@ getdepsbuild [make.install_args] install-getdeps -[make.test_args] -test-getdeps - [shipit.pathmap] fbcode/configerator/structs/scm/hg = configerator/structs/scm/hg fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/hg diff --git a/eden/scm/Makefile b/eden/scm/Makefile index f9b68b178954d..18f0fe8a49200 100644 --- a/eden/scm/Makefile +++ b/eden/scm/Makefile @@ -164,12 +164,6 @@ install-getdeps: getdepsbuild GETDEPS_BUILD=1 $(shell $(PYTHON3) contrib/pick_python.py $(PYTHON3)) \ setup.py $(PURE) install --root="$(DESTDIR)/" --prefix="$(PREFIX)" --install-lib="$(PREFIX)/bin" --force -test-getdeps: install-getdeps - # Run one test to check the binary is minimally good as will be used later in Mononoke getdeps tests - # Running all the tests requires a bit of filtering to run the good set (or deleting flaky ones) - cd tests && PYTHON_SYS_EXECUTABLE=$(shell $(PYTHON3) contrib/pick_python.py $(PYTHON3)) \ - $(shell $(PYTHON3) contrib/pick_python.py $(PYTHON3)) run-tests.py -j1 --getdeps-build --with-hg="$(PREFIX)/bin/$(HGNAME)" test-status.t test-convert.t - check: tests .PHONY: tests