Changeset 3147 in MondoRescue for branches/3.1/mondo/test

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

Location:

branches/3.1/mondo/test

Files:

• Makefile.am (modified) (2 diffs)
• README (copied) (copied from branches/3.0/mondo/test/README )
• mondo-test (copied) (copied from branches/3.0/mondo/test/mondo-test )
• mountlist-md.txt (copied) (copied from branches/3.0/mondo/test/mountlist-md.txt )
• raidtab-md.txt (copied) (copied from branches/3.0/mondo/test/raidtab-md.txt )
• test-mountlist.c (modified) (6 diffs)
• test-mr_stresc.c (copied) (copied from branches/3.0/mondo/test/test-mr_stresc.c )
• test-truncname.c (modified) (2 diffs)

branches/3.1/mondo/test/Makefile.am

@@ -3 +3 @@
 ## The program
 sbin_PROGRAMS         = mrtest_mountlist mrtest_truncname mrtest_conf mrtest_mem mrtest_msg mrtest_string
+mrtestdir                 = $(pkglibdir)/test
+mrtest_PROGRAMS           = mrtest_mountlist mrtest_truncname mrtest_stresc
 mrtest_mountlist_SOURCES  = test-mountlist.c ${top_builddir}/src/mondorestore/mondo-prep.c ${top_builddir}/src/mondorestore/mondo-rstr-newt.c ${top_builddir}/src/mondorestore/mondo-rstr-tools.c
 mrtest_mountlist_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
@@ -15 +17 @@
 mrtest_string_SOURCES       = test-string.c
 mrtest_string_LDADD         = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
+mrtest_stresc_SOURCES     = test-mr_stresc.c
+mrtest_stresc_LDADD       = ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@

branches/3.1/mondo/test/test-mountlist.c

@@ -3 +3 @@
  *
  * Test program for mountlist management at restore time
- * Cn be used on host system with valgrind easier than with mondorestore
+ * Can be used on host system with valgrind easier than with mondorestore
  */
 #include <stdio.h>
@@ -12 +12 @@
 #include "../mondorestore/mondorestore.h"
 #include "../mondorestore/mr-externs.h"
+
+#define RAIDTAB_TEST "/tmp/raidtab"
+#define MOUNTLIST_TEST "/tmp/mountlist.txt"
 
 extern void twenty_seconds_til_yikes(void);
@@ -23 +26 @@
 extern int g_partition_table_locked_up;
 extern int g_noof_rows;
+
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
 
 bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
@@ -64 +70 @@
 
 setup_newt_stuff();
+mr_asprintf(&g_mountlist_fname, MOUNTLIST_TEST);
 log_it("before mountlist");
 load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
@@ -69 +76 @@
 resize_mountlist_proportionately_to_suit_new_drives(mountlist);
 log_it("after resize_mountlist_proportionately_to_suit_new_drives");
-load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+load_raidtab_into_raidlist(raidlist, RAIDTAB_TEST);
 log_it("after load_raidtab_into_raidlist");
 edit_mountlist(MINDI_CACHE"/mountlist.txt", mountlist, raidlist);
@@ -78 +85 @@
 mr_free(flaws_str);
 
+log_it("before check raidlist content");
+log_it("after check raidlist content");
+
+log_it("before create mdadm dev");
+create_raid_device_via_mdadm(raidlist,"/dev/md0",FALSE);
+create_raid_device_via_mdadm(raidlist,"/dev/md1",FALSE);
+log_it("after create mdadm dev");
+
+free(mountlist);
+free(raidlist);
 mr_free(MONDO_LOGFILE);
+mr_free(g_mountlist_fname);
 exit(0);
 }

branches/3.1/mondo/test/test-truncname.c

@@ -23 +23 @@
 extern int g_noof_rows;
 
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
+
 bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
 bool g_I_have_just_nuked = FALSE;
@@ -37 +40 @@
 
 extern char *MONDO_LOGFILE;
-extern char *truncate_to_drive_name(char *);
+extern char *truncate_to_drive_name(const char *);
 /* We don't have a cleanup function yet */
 void (*mr_cleanup)(int) = NULL;