Did some renaming and made a few simple fixes.basic_rs

2 files changed, 22 insertions, 21 deletions

diff --git a/test/builtin/rs_vand/rs_vand_internal_test.c b/test/builtin/rs_vand/rs_vand_internal_test.c
index 6b8ed45..139c91f 100644
--- a/test/builtin/rs_vand/rs_vand_internal_test.c
+++ b/test/builtin/rs_vand/rs_vand_internal_test.c
@@ -149,7 +149,7 @@ int test_encode_decode(int k, int m, int num_missing, int blocksize)
   }
   
   // Encode
-  liberasurecode_rs_vand_encode(matrix, data, parity, k, m, blocksize); 
+  internal_rs_vand_encode(matrix, data, parity, k, m, blocksize); 
 
   // Copy data and parity
   for (i = 0;i < num_missing; i++) {
@@ -172,7 +172,7 @@ int test_encode_decode(int k, int m, int num_missing, int blocksize)
   }
   
   // Decode and check
-  liberasurecode_rs_vand_decode(matrix, data, parity, k, m, missing, blocksize, 1);
+  internal_rs_vand_decode(matrix, data, parity, k, m, missing, blocksize, 1);
 
   for (i = 0; i < num_missing; i++) {
     int idx = missing[i];
@@ -232,7 +232,7 @@ int test_reconstruct(int k, int m, int num_missing, int blocksize)
   }
   
   // Encode
-  liberasurecode_rs_vand_encode(matrix, data, parity, k, m, blocksize); 
+  internal_rs_vand_encode(matrix, data, parity, k, m, blocksize); 
 
   // Copy data and parity
   for (i = 0; i < num_missing; i++) {
@@ -258,7 +258,7 @@ int test_reconstruct(int k, int m, int num_missing, int blocksize)
   }
   
   // Reconstruct and check destination buffer
-  liberasurecode_rs_vand_reconstruct(matrix, data, parity, k, m, missing, destination_idx, blocksize);
+  internal_rs_vand_reconstruct(matrix, data, parity, k, m, missing, destination_idx, blocksize);
 
   // The original copy of the destination buffer is in the 0th buffer (see above)
   if (destination_idx < k) { 
diff --git a/test/liberasurecode_test.c b/test/liberasurecode_test.c
index e1e79cf..18bff4b 100644
--- a/test/liberasurecode_test.c
+++ b/test/liberasurecode_test.c
@@ -278,7 +278,7 @@ char * get_name_from_backend_id(ec_backend_id_t be) {
             return ISA_L_RS_VAND_BACKEND;
         case EC_BACKEND_SHSS:
             return SHSS_BACKEND;
-        case EC_BACKEND_LIBERASURECODE_RS_VAND:
+        case EC_BACKEND_INTERNAL_RS_VAND:
             return RS_VAND_BACKEND;
         default:
             return "UNKNOWN";
@@ -302,7 +302,7 @@ struct ec_args *create_ec_args(ec_backend_id_t be, ec_checksum_type_t ct, int ba
         case EC_BACKEND_JERASURE_RS_CAUCHY:
             backend_args_array = jerasure_rs_cauchy_test_args;
             break;
-        case EC_BACKEND_LIBERASURECODE_RS_VAND:
+        case EC_BACKEND_INTERNAL_RS_VAND:
             backend_args_array = internal_rs_vand_test_args;
             break;
         case EC_BACKEND_FLAT_XOR_HD:
@@ -462,6 +462,7 @@ static void test_create_and_destroy_backend(
         fprintf (stderr, "Backend library not available!\n");
         return;
     }
+    fprintf(stderr, "HI: %d\n", desc);
     assert(desc > 0);
     assert(0 == liberasurecode_instance_destroy(desc));
 }
@@ -1831,63 +1832,63 @@ struct testcase testcases[] = {
     // Internal RS Vand backend tests
     {"create_and_destroy_backend",
         test_create_and_destroy_backend,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"simple_encode_internal_rs_vand",
         test_simple_encode_decode,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"decode_with_missing_data_internal_rs_vand",
         test_decode_with_missing_data,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"decode_with_missing_multi_data_internal_rs_vand",
         test_decode_with_missing_multi_data,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"decode_with_missing_multi_parity_internal_rs_vand",
         test_decode_with_missing_multi_parity,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"test_decode_with_missing_multi_data_parity_internal_rs_vand",
         test_decode_with_missing_multi_data_parity,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"simple_reconstruct_internal_rs_vand",
         test_simple_reconstruct,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"test_fragments_needed_internal_rs_vand",
         test_fragments_needed,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"test_get_fragment_metadata_internal_rs_vand",
         test_get_fragment_metadata,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"test_get_fragment_metadata_internal_rs_vand_crc32",
         test_get_fragment_metadata,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
         .skip = false},
     {"test_verify_stripe_metadata",
         test_verify_stripe_metadata,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
         .skip = false},
     {"test_verify_stripe_metadata_libec_mismatch",
          test_verify_stripe_metadata_libec_mismatch,
-         EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+         EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
          .skip = false},
     {"test_verify_stripe_metadata_magic_mismatch",
           test_verify_stripe_metadata_magic_mismatch,
-          EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+          EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
          .skip = false},
     {"test_verify_stripe_metadata_be_id_mismatch",
          test_verify_stripe_metadata_be_id_mismatch,
-         EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+         EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
          .skip = false},
     {"test_verify_stripe_metadata_be_ver_mismatch",
         test_verify_stripe_metadata_be_ver_mismatch,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
         .skip = false},
     { NULL, NULL, 0, 0, false },
 };