Merge remote-tracking branch \'toybox/master\' into HEAD am: b9cc6c6427 am: 2d7aedf735

[android-x86/external-toybox.git] / scripts / genconfig.sh

diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh
index e53d360..e4c2aad 100755 (executable)
--- a/scripts/genconfig.sh
+++ b/scripts/genconfig.sh
@@ -90,6 +90,13 @@ EOF
     int main(int argc, char *argv[]) { return fork(); }
 EOF
   echo -e '\tdepends on !TOYBOX_MUSL_NOMMU_IS_BROKEN'
+
+  probesymbol TOYBOX_PRLIMIT << EOF
+    #include <sys/time.h>
+    #include <sys/resource.h>
+
+    int main(int argc, char *argv[]) { prlimit(0, 0, 0, 0); }
+EOF
 }
 
 genconfig()
@@ -123,7 +130,7 @@ genconfig > generated/Config.in || rm generated/Config.in
 # Find names of commands that can be built standalone in these C files
 toys()
 {
-  grep 'TOY(.*)' "$@" | grep -v TOYFLAG_NOFORK | \
+  grep 'TOY(.*)' "$@" | grep -v TOYFLAG_NOFORK | grep -v "0))" | \
     sed -rn 's/([^:]*):.*(OLD|NEW)TOY\( *([a-zA-Z][^,]*) *,.*/\1:\3/p'
 }
 
@@ -135,13 +142,13 @@ do
   [ "$NAME" == help ] && continue
   [ "$NAME" == install ] && continue
   echo -e "$NAME: $FILE *.[ch] lib/*.[ch]\n\tscripts/single.sh $NAME\n"
+  echo -e "test_$NAME:\n\tscripts/test.sh $NAME\n"
   [ "${FILE/pending//}" != "$FILE" ] &&
     PENDING="$PENDING $NAME" ||
     WORKING="$WORKING $NAME"
-done > .singlemake &&
-echo -e "clean::\n\trm -f $WORKING $PENDING" >> .singlemake &&
-echo -e "working:\n\t@echo $(echo $WORKING | tr ' ' '\n' | sort | xargs)" \
-  >> .singlemake &&
-echo -e "pending:\n\t@echo $(echo $PENDING | tr ' ' '\n' | sort | xargs)" \
-  >> .singlemake
-)
+done &&
+echo -e "clean::\n\trm -f $WORKING $PENDING" &&
+echo -e "list:\n\t@echo $(echo $WORKING | tr ' ' '\n' | sort | xargs)" &&
+echo -e "list_pending:\n\t@echo $(echo $PENDING | tr ' ' '\n' | sort | xargs)" &&
+echo -e ".PHONY: $WORKING $PENDING" | sed 's/ \([^ ]\)/ test_\1/g'
+) > .singlemake