Bug 1280846 - taskcluster: re-enable gtests in nss-util modular build, r=franziskus
authorDaiki Ueno <dueno@redhat.com>
Mon, 03 Jul 2017 16:29:27 +0200
changeset 13510 3c4f0e9f6e45107dc106f709eaa54f5d096f49a7
parent 13509 cdba8bea84a477cf2bb71be560c2d4a3856778ae
child 13518 481dd1cb873c4abe0cea3dd12cd1572a46ddaeee
child 13521 a719422c756d5842d19f354c357017bbff260c2c
push id2309
push userfranziskuskiefer@gmail.com
push dateMon, 07 Aug 2017 13:29:32 +0000
reviewersfranziskus
bugs1280846
Bug 1280846 - taskcluster: re-enable gtests in nss-util modular build, r=franziskus
automation/taskcluster/scripts/split.sh
--- a/automation/taskcluster/scripts/split.sh
+++ b/automation/taskcluster/scripts/split.sh
@@ -18,26 +18,20 @@ split_util() {
   #   nss/coreconf                full directory
   #   nss                         top files only
   #   nss/lib                     top files only
   #   nss/lib/util                full directory
 
   # Copy everything.
   cp -R $nssdir $dstdir
 
-  # Skip gtests when building.
-  sed '/^DIRS = /s/ cpputil gtests$//' $nssdir/manifest.mn > $dstdir/manifest.mn-t && mv $dstdir/manifest.mn-t $dstdir/manifest.mn
-
   # Remove subdirectories that we don't want.
   rm -rf $dstdir/cmd
-  rm -rf $dstdir/tests
   rm -rf $dstdir/lib
   rm -rf $dstdir/automation
-  rm -rf $dstdir/gtests
-  rm -rf $dstdir/cpputil
   rm -rf $dstdir/doc
 
   # Start with an empty cmd lib directories to be filled selectively.
   mkdir $dstdir/cmd
   cp $nssdir/cmd/Makefile $dstdir/cmd
   cp $nssdir/cmd/manifest.mn $dstdir/cmd
   cp $nssdir/cmd/platlibs.mk $dstdir/cmd
   cp $nssdir/cmd/platrules.mk $dstdir/cmd