Add script tests and minor updates

README.md

@@ -74,6 +74,7 @@ Supported boards/methods:
   atecc508a    Read an ATECC508A (I2C device '-f', I2C address '-a')
   nerves_key   Read a NervesKey (I2C device '-f', I2C address '-a')
   dmi          Read the system ID out of the SMBIOS/DMI
+  script       Run a script to get the ID (Specify script with '-f')
   force        Force the ID (Specify ID with '-f')
 
 Without the `-b` option, `boardid` will try a few methods of determining an ID.

src/script.c

@@ -28,7 +28,7 @@ bool script_id(const struct boardid_options *options, char *buffer)
 
     if (pid == 0) {
         // child
-        int devnull = open("/dev/null", O_RDWR);
+        int devnull = open("/dev/null", O_RDONLY);
         if (devnull < 0)
             exit(EXIT_FAILURE);
 
@@ -40,6 +40,7 @@ bool script_id(const struct boardid_options *options, char *buffer)
         dup2(pipefd[1], STDOUT_FILENO);
         dup2(pipefd[1], STDERR_FILENO);
         close(devnull);
+        close(pipefd[1]);
 
         char* argv[] = {
             (char*)options->filename,

tests/047_script_all

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2023 Nerves Project Developers
+#
+# SPDX-License-Identifier: Apache-2.0
+
+#
+# Script
+#
+
+cat >$WORK/etc/my_serial <<EOF
+#!/bin/sh
+
+printf "12345678"
+EOF
+chmod +x $WORK/etc/my_serial
+
+CMDLINE="-b script -f $WORK/etc/my_serial"
+
+cat >$EXPECTED <<EOF
+12345678
+EOF

tests/048_script_parts

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2023 Nerves Project Developers
+#
+# SPDX-License-Identifier: Apache-2.0
+
+#
+# Script that outputs the serial number in pieces
+#
+
+cat >$WORK/etc/my_serial <<EOF
+#!/bin/sh
+
+printf "1"
+printf "2"
+printf "3"
+printf "4"
+printf "5"
+printf "6"
+printf "7"
+printf "8"
+EOF
+chmod +x $WORK/etc/my_serial
+
+CMDLINE="-b script -f $WORK/etc/my_serial"
+
+cat >$EXPECTED <<EOF
+12345678
+EOF

tests/049_script_fail

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2023 Nerves Project Developers
+#
+# SPDX-License-Identifier: Apache-2.0
+
+#
+# Script that prints something but returns error should fail
+#
+
+cat >$WORK/etc/my_serial <<EOF
+#!/bin/sh
+
+printf "12345678"
+exit 1
+EOF
+chmod +x $WORK/etc/my_serial
+
+CMDLINE="-b script -f $WORK/etc/my_serial"
+
+cat >$EXPECTED <<EOF
+00000000000000000000000000000000
+EOF

tests/050_script_read

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2023 Nerves Project Developers
+#
+# SPDX-License-Identifier: Apache-2.0
+
+#
+# Test that reading from stdin in the script doesn't hang
+#
+
+cat >$WORK/etc/my_serial <<EOF
+#!/bin/sh
+
+read bad_script
+cat >$WORK/testing
+
+printf "23456781"
+EOF
+chmod +x $WORK/etc/my_serial
+
+CMDLINE="-b script -f $WORK/etc/my_serial"
+
+cat >$EXPECTED <<EOF
+23456781
+EOF

tests/051_script_too_long

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2023 Nerves Project Developers
+#
+# SPDX-License-Identifier: Apache-2.0
+
+#
+# Test script outputing too much. Result should max out at 31 characters.
+#
+
+cat >$WORK/etc/my_serial <<EOF
+#!/bin/sh
+
+printf "0123456789"
+printf "0123456789"
+printf "0123456789"
+printf "0123456789"
+printf "0123456789"
+printf "0123456789"
+printf "0123456789"
+printf "0123456789"
+EOF
+chmod +x $WORK/etc/my_serial
+
+CMDLINE="-b script -f $WORK/etc/my_serial"
+
+cat >$EXPECTED <<EOF
+01234567890123456789012345678901
+EOF