Skip to content

Fix make clean by removing rebase markers #1474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reshke merged 1 commit into from
Dec 6, 2025
+0 −18
Merged

Fix make clean by removing rebase markers #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/test/modules/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ SUBDIRS = \
test_custom_rmgrs \
test_ddl_deparse \
test_escape \
<<<<<<< HEAD
=======
test_extensions \
>>>>>>> REL_16_9
test_ginpostinglist \
test_integerset \
test_lfind \
Expand All @@ -35,11 +32,8 @@ SUBDIRS = \
test_regex \
test_rls_hooks \
test_shm_mq \
<<<<<<< HEAD
=======
test_slru \
unsafe_tests \
>>>>>>> REL_16_9
worker_spi

#ignore cases:
Expand Down
8 changes: 0 additions & 8 deletions src/test/modules/test_extensions/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,21 @@ PGFILEDESC = "test_extensions - regression testing for EXTENSION support"
EXTENSION = test_ext1 test_ext2 test_ext3 test_ext4 test_ext5 test_ext6 \
test_ext7 test_ext8 test_ext_cine test_ext_cor \
test_ext_cyclic1 test_ext_cyclic2 \
<<<<<<< HEAD
test_ext_extschema
=======
test_ext_extschema \
test_ext_evttrig \
test_ext_req_schema1 test_ext_req_schema2 test_ext_req_schema3

>>>>>>> REL_16_9
DATA = test_ext1--1.0.sql test_ext2--1.0.sql test_ext3--1.0.sql \
test_ext4--1.0.sql test_ext5--1.0.sql test_ext6--1.0.sql \
test_ext7--1.0.sql test_ext7--1.0--2.0.sql test_ext8--1.0.sql \
test_ext_cine--1.0.sql test_ext_cine--1.0--1.1.sql \
test_ext_cor--1.0.sql \
test_ext_cyclic1--1.0.sql test_ext_cyclic2--1.0.sql \
<<<<<<< HEAD
test_ext_extschema--1.0.sql
=======
test_ext_extschema--1.0.sql \
test_ext_evttrig--1.0.sql test_ext_evttrig--1.0--2.0.sql \
test_ext_req_schema1--1.0.sql \
test_ext_req_schema2--1.0.sql \
test_ext_req_schema3--1.0.sql
>>>>>>> REL_16_9


REGRESS = test_extensions #test_extdepend TODO: enable this test after https://github.com/greenplum-db/gpdb/issues/14532
Expand Down
4 changes: 0 additions & 4 deletions src/test/recovery/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ subdir = src/test/recovery
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global

<<<<<<< HEAD
# required for 017_shm.pl
=======
# required for 017_shm.pl and 027_stream_regress.pl
>>>>>>> REL_16_9
REGRESS_SHLIB=$(abs_top_builddir)/src/test/regress/regress$(DLSUFFIX)
export REGRESS_SHLIB

Expand Down