hare

commit 9f828eb9cfc8a7d8231b94c7929e25eb361453f6
parent 5208ad9416575d8b48bcd29a90fa1427525bc07f
Author: Ember Sawady <ecs@d2evs.net>
Date:   Sun, 21 May 2023 08:12:18 +0000

Even more fixes for ambiguous files

Signed-off-by: Ember Sawady <ecs@d2evs.net>

Diffstat:
R
crypto/aes/+test/ni+x86_64.ha -> crypto/aes/+test/ni_test+x86_64.ha
 | 
0

R
crypto/bigint/+test/arithm.ha -> crypto/bigint/+test/arithm_test.ha
 | 
0

R
crypto/bigint/+test/encoding.ha -> crypto/bigint/+test/encoding_test.ha
 | 
0

R
crypto/bigint/+test/monty.ha -> crypto/bigint/+test/monty_test.ha
 | 
0

R
crypto/rsa/+test/core.ha -> crypto/rsa/+test/core_test.ha
 | 
0

R
crypto/rsa/+test/keys.ha -> crypto/rsa/+test/keys_test.ha
 | 
0

R
crypto/rsa/+test/pkcs1.ha -> crypto/rsa/+test/pkcs1_test.ha
 | 
0

R
net/ip/+test.ha -> net/ip/test+test.ha
 | 
0

M
scripts/gen-stdlib
 | 
9
+++++----
M
stdlib.mk
 | 
16
++++++++--------

10 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/crypto/aes/+test/ni+x86_64.ha b/crypto/aes/+test/ni_test+x86_64.ha
diff --git a/crypto/bigint/+test/arithm.ha b/crypto/bigint/+test/arithm_test.ha
diff --git a/crypto/bigint/+test/encoding.ha b/crypto/bigint/+test/encoding_test.ha
diff --git a/crypto/bigint/+test/monty.ha b/crypto/bigint/+test/monty_test.ha
diff --git a/crypto/rsa/+test/core.ha b/crypto/rsa/+test/core_test.ha
diff --git a/crypto/rsa/+test/keys.ha b/crypto/rsa/+test/keys_test.ha
diff --git a/crypto/rsa/+test/pkcs1.ha b/crypto/rsa/+test/pkcs1_test.ha
diff --git a/net/ip/+test.ha b/net/ip/test+test.ha
diff --git a/scripts/gen-stdlib b/scripts/gen-stdlib
@@ -358,8 +358,8 @@ crypto_bigint() {
 		gensrcs_crypto_bigint
         gen_ssa crypto::bigint bytes crypto::math
 	else
-		gensrcs_crypto_bigint +test/arithm.ha +test/encoding.ha \
-            +test/monty.ha +test/utils.ha
+		gensrcs_crypto_bigint +test/arithm_test.ha +test/encoding_test.ha \
+            +test/monty_test.ha +test/utils.ha
         gen_ssa crypto::bigint bytes crypto::math encoding::hex
 	fi
 }
@@ -474,7 +474,8 @@ crypto_rsa() {
 		gensrcs_crypto_rsa
 		genssa_crypto_rsa
 	else
-		gensrcs_crypto_rsa +test/core.ha +test/keys.ha +test/pkcs1.ha
+		gensrcs_crypto_rsa +test/core_test.ha +test/keys_test.ha \
+			+test/pkcs1_test.ha
 		genssa_crypto_rsa
 	fi
 }
@@ -1078,7 +1079,7 @@ net_ip() {
 		gensrcs_net_ip
 	else
 		gensrcs_net_ip \
-			+test.ha
+			test+test.ha
 	fi
 	gen_ssa -plinux net::ip bytes endian io strconv strings strio fmt
 	gen_ssa -pfreebsd net::ip bytes endian io strconv strings strio fmt
diff --git a/stdlib.mk b/stdlib.mk
@@ -3413,9 +3413,9 @@ testlib_crypto_bigint_any_srcs = \
 	$(STDLIB)/crypto/bigint/monty.ha \
 	$(STDLIB)/crypto/bigint/types.ha \
 	$(STDLIB)/crypto/bigint/util.ha \
-	$(STDLIB)/crypto/bigint/+test/arithm.ha \
-	$(STDLIB)/crypto/bigint/+test/encoding.ha \
-	$(STDLIB)/crypto/bigint/+test/monty.ha \
+	$(STDLIB)/crypto/bigint/+test/arithm_test.ha \
+	$(STDLIB)/crypto/bigint/+test/encoding_test.ha \
+	$(STDLIB)/crypto/bigint/+test/monty_test.ha \
 	$(STDLIB)/crypto/bigint/+test/utils.ha
 
 $(TESTCACHE)/crypto/bigint/crypto_bigint-any.ssa: $(testlib_crypto_bigint_any_srcs) $(testlib_rt) $(testlib_bytes_$(PLATFORM)) $(testlib_crypto_math_$(PLATFORM)) $(testlib_encoding_hex_$(PLATFORM))
@@ -3524,9 +3524,9 @@ testlib_crypto_rsa_any_srcs = \
 	$(STDLIB)/crypto/rsa/errors.ha \
 	$(STDLIB)/crypto/rsa/keys.ha \
 	$(STDLIB)/crypto/rsa/pkcs1.ha \
-	$(STDLIB)/crypto/rsa/+test/core.ha \
-	$(STDLIB)/crypto/rsa/+test/keys.ha \
-	$(STDLIB)/crypto/rsa/+test/pkcs1.ha
+	$(STDLIB)/crypto/rsa/+test/core_test.ha \
+	$(STDLIB)/crypto/rsa/+test/keys_test.ha \
+	$(STDLIB)/crypto/rsa/+test/pkcs1_test.ha
 
 $(TESTCACHE)/crypto/rsa/crypto_rsa-any.ssa: $(testlib_crypto_rsa_any_srcs) $(testlib_rt) $(testlib_bufio_$(PLATFORM)) $(testlib_bytes_$(PLATFORM)) $(testlib_crypto_bigint_$(PLATFORM)) $(testlib_crypto_math_$(PLATFORM)) $(testlib_crypto_sha1_$(PLATFORM)) $(testlib_crypto_sha256_$(PLATFORM)) $(testlib_crypto_sha512_$(PLATFORM)) $(testlib_endian_$(PLATFORM)) $(testlib_errors_$(PLATFORM)) $(testlib_hash_$(PLATFORM)) $(testlib_io_$(PLATFORM)) $(testlib_types_$(PLATFORM))
 	@printf 'HAREC \t$@\n'
@@ -4257,13 +4257,13 @@ $(TESTCACHE)/net/dns/net_dns-any.ssa: $(testlib_net_dns_any_srcs) $(testlib_rt) 
 testlib_net_ip_linux_srcs = \
 	$(STDLIB)/net/ip/+linux.ha \
 	$(STDLIB)/net/ip/ip.ha \
-	$(STDLIB)/net/ip/+test.ha
+	$(STDLIB)/net/ip/test+test.ha
 
 # net::ip (+freebsd)
 testlib_net_ip_freebsd_srcs = \
 	$(STDLIB)/net/ip/+freebsd.ha \
 	$(STDLIB)/net/ip/ip.ha \
-	$(STDLIB)/net/ip/+test.ha
+	$(STDLIB)/net/ip/test+test.ha
 
 $(TESTCACHE)/net/ip/net_ip-linux.ssa: $(testlib_net_ip_linux_srcs) $(testlib_rt) $(testlib_bytes_$(PLATFORM)) $(testlib_endian_$(PLATFORM)) $(testlib_io_$(PLATFORM)) $(testlib_strconv_$(PLATFORM)) $(testlib_strings_$(PLATFORM)) $(testlib_strio_$(PLATFORM)) $(testlib_fmt_$(PLATFORM))
 	@printf 'HAREC \t$@\n'