<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/20a2651a4b95e443b698652b7533fa3f2d67dd14">https://github.com/macports/macports-legacy-support/commit/20a2651a4b95e443b698652b7533fa3f2d67dd14</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 20a2651a4b95e443b698652b7533fa3f2d67dd14
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Mon May 12 21:39:28 2025 -0700
<span style='display:block; white-space:pre;color:#404040;'> test_f?sl: Fix gratuitous verbosity.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This implements verbose mode, and suppresses most non-error output in
</span><span style='display:block; white-space:pre;color:#404040;'> non-verbose mode. It does NOT fix the tests to actually check the
</span><span style='display:block; white-space:pre;color:#404040;'> results for correctness.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Pass on all platforms.
</span><span style='display:block; white-space:pre;color:#404040;'> Output as expected.
</span>---
test/test_ffsl.c | 30 +++++++++++++++++++-----------
test/test_flsl.c | 30 +++++++++++++++++++-----------
2 files changed, 38 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_ffsl.c b/test/test_ffsl.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e503cf..beec2ec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_ffsl.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/test/test_ffsl.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) 2020 Chris Jones
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2025 Frederick H. G. Wright II <fw@fwright.net>
</span> *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,40 +15,48 @@
</span> * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <libgen.h>
</span> #include <stdio.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <string.h>
</span> #include <strings.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret = 0, verbose = 0;
</span> const int offset = 4;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( "testing ffsl :-\n" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argc > 1 && !strcmp(argv[1], "-v")) verbose = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* FIXME: Actually check the results for correctness */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( "testing ffsl :-\n" );
</span> for ( int i = 0; i <= 8*sizeof(int)-offset; i+=offset ) {
const int ii = i+offset;
long int test = ( i>0 ? 1UL << (i-1) : 0 );
test |= ( ii>0 ? 1UL << (ii-1) : 0 );
const int j = ffs(test);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( "testing ffsl :-\n" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( "testing ffsl :-\n" );
</span> for ( int i = 0; i <= 8*sizeof(long int)-offset; i+=offset ) {
const int ii = i+offset;
long int test = ( i>0 ? 1UL << (i-1) : 0 );
test |= ( ii>0 ? 1UL << (ii-1) : 0 );
const int j = ffsl(test);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( "testing ffsll :-\n" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( "testing ffsll :-\n" );
</span> for ( int i = 0; i <= 8*sizeof(long long int)-offset; i+=offset ) {
const int ii = i+offset;
long long int test = ( i>0 ? 1UL << (i-1) : 0 );
test |= ( ii>0 ? 1UL << (ii-1) : 0 );
const int j = ffsll(test);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("%s %s.\n", basename(argv[0]), ret ? "failed" : "succeeded");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_flsl.c b/test/test_flsl.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 4efa35c..0d13415 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_flsl.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/test/test_flsl.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /*
* Copyright (c) 2020 Chris Jones
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (c) 2025 Frederick H. G. Wright II <fw@fwright.net>
</span> *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,40 +15,48 @@
</span> * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <libgen.h>
</span> #include <stdio.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <string.h>
</span> #include <strings.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret = 0, verbose = 0;
</span> const int offset = 4;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( "testing fls :-\n" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argc > 1 && !strcmp(argv[1], "-v")) verbose = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* FIXME: Actually check the results for correctness */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( "testing fls :-\n" );
</span> for ( int i = 0; i <= 8*sizeof(int)-offset; i+=offset ) {
const int ii = i+offset;
int test = ( i>0 ? 1UL << (i-1) : 0 );
test |= ( ii>0 ? 1UL << (ii-1) : 0 );
const int j = fls(test);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( "testing flsl :-\n" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( "testing flsl :-\n" );
</span> for ( int i = 0; i <= 8*sizeof(long int)-offset; i+=offset ) {
const int ii = i+offset;
long int test = ( i>0 ? 1UL << (i-1) : 0 );
test |= ( ii>0 ? 1UL << (ii-1) : 0 );
const int j = flsl(test);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( "testing flsll :-\n" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( "testing flsll :-\n" );
</span> for ( int i = 0; i <= 8*sizeof(long long int)-offset; i+=offset ) {
const int ii = i+offset;
long long int test = ( i>0 ? 1UL << (i-1) : 0 );
test |= ( ii>0 ? 1UL << (ii-1) : 0 );
const int j = flsll(test);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose) printf( " Set bits %i,%i - Found bit %i\n", i, ii, j );
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("%s %s.\n", basename(argv[0]), ret ? "failed" : "succeeded");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>