CMP test server: move apps/{,lib/}cmp_mock_srv.c and apps/{,include/}cmp_mock_srv.h

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15343)

diff --git a/apps/build.info b/apps/build.info
index 308f4d94f8a68e98bb0b5996b48a943a1ea42caa..020d129f8cacca8f57df3f91c875f88c8b9356aa 100644 (file)
--- a/apps/build.info
+++ b/apps/build.info
@@ -52,7 +52,7 @@ IF[{- !$disabled{'cms'} -}]
   $OPENSSLSRC=$OPENSSLSRC cms.c
 ENDIF
 IF[{- !$disabled{'cmp'} -}]
-  $OPENSSLSRC=$OPENSSLSRC cmp.c cmp_mock_srv.c
+  $OPENSSLSRC=$OPENSSLSRC cmp.c lib/cmp_mock_srv.c
 ENDIF
 
 IF[{- !$disabled{apps} -}]

diff --git a/apps/cmp_mock_srv.h b/apps/include/cmp_mock_srv.h
similarity index 100%
rename from apps/cmp_mock_srv.h
rename to apps/include/cmp_mock_srv.h

diff --git a/apps/cmp_mock_srv.c b/apps/lib/cmp_mock_srv.c
similarity index 100%
rename from apps/cmp_mock_srv.c
rename to apps/lib/cmp_mock_srv.c

diff --git a/test/build.info b/test/build.info
index 842a7bbe3519bf250d56bbfa98d75fa88061a0f4..58d75be5d4224f86033c32852acfbf7b7c5407e0 100644 (file)
--- a/test/build.info
+++ b/test/build.info
@@ -529,7 +529,7 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[cmp_server_test]=.. ../include ../apps/include
   DEPEND[cmp_server_test]=../libcrypto.a libtestutil.a
 
-  SOURCE[cmp_client_test]=cmp_client_test.c helpers/cmp_testlib.c ../apps/cmp_mock_srv.c
+  SOURCE[cmp_client_test]=cmp_client_test.c helpers/cmp_testlib.c ../apps/lib/cmp_mock_srv.c
   INCLUDE[cmp_client_test]=.. ../include ../apps/include
   DEPEND[cmp_client_test]=../libcrypto.a libtestutil.a
 

diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c
index 35a7c30f927adb94283920ba22e6fc2546778017..3d9b37b3a2fc4fae6bbf224fc367090d8064466d 100644 (file)
--- a/test/cmp_client_test.c
+++ b/test/cmp_client_test.c
@@ -11,7 +11,7 @@
 
 #include "helpers/cmp_testlib.h"
 
-#include "apps/cmp_mock_srv.h"
+#include "cmp_mock_srv.h"
 
 #ifndef NDEBUG /* tests need mock server, which is available only if !NDEBUG */
 

diff --git a/util/find-doc-nits b/util/find-doc-nits
index fd465f6d0be0315eff78cb0520c5665e32ee9a29..815880ad01d429d77d46eac2807251191251bc8c 100755 (executable)
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -1128,7 +1128,7 @@ if ( $opt_c ) {
     # See if each has a manpage.
     foreach my $cmd ( @commands ) {
         $cmd =~ s/\.c$//;
-        next if $cmd eq 'progs' || $cmd eq 'cmp_mock_srv' || $cmd eq 'vms_decc_init';
+        next if $cmd eq 'progs' || $cmd eq 'vms_decc_init';
         my @doc = ( grep { basename($_) eq "openssl-$cmd.pod"
                            # For "tsget" and "CA.pl" pod pages
                            || basename($_) eq "$cmd.pod" }