Skip to content

Commit

Permalink
test-container: Install with $(sorted-subdirs) [BZ #24794]
Browse files Browse the repository at this point in the history
Commit 35e038c started to use an
incomplete list of subdirs based on $(all-subdirs) causing
testroot.pristine to miss files from nss.

Tested if the list of files in testroot.pristine remains the same.

	[BZ #24794]
	* Makeconfig (all-subdirs): Improved source comments.
	* Makefile (testroot.pristine/install.stamp): Pass
	subdirs='$(sorted-subdirs)' to make install.
  • Loading branch information
tuliom committed Jul 29, 2019
1 parent 50ce3ea commit 354e4c1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2019-07-29 DJ Delorie <[email protected]>
Tulio Magno Quites Machado Filho <[email protected]>

[BZ #24794]
* Makeconfig (all-subdirs): Improved source comments.
* Makefile (testroot.pristine/install.stamp): Pass
subdirs='$(sorted-subdirs)' to make install.

2019-07-25 Florian Weimer <[email protected]>

[BZ #24677]
Expand Down
6 changes: 3 additions & 3 deletions Makeconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1267,9 +1267,9 @@ else
libsupport = $(common-objpfx)support/libsupport.a
endif

# These are the subdirectories containing the library source. The order
# is more or less arbitrary. The sorting step will take care of the
# dependencies.
# This is a partial list of subdirectories containing the library source.
# The order is more or less arbitrary. The sorting step will take care of the
# dependencies and generate sorted-subdirs dynamically.
all-subdirs = csu assert ctype locale intl catgets math setjmp signal \
stdlib stdio-common libio malloc string wcsmbs time dirent \
grp pwd posix io termios resource misc socket sysvipc gmon \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ ifeq ($(run-built-tests),yes)
done
endif
$(MAKE) install DESTDIR=$(objpfx)testroot.pristine \
subdirs='$(all-subdirs)'
subdirs='$(sorted-subdirs)'
touch $(objpfx)testroot.pristine/install.stamp

tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
Expand Down

0 comments on commit 354e4c1

Please sign in to comment.